From ceea10ad6c046160ed0c2b81a4f263ff37934f69 Mon Sep 17 00:00:00 2001 From: Armando Belardo <11140328+armandobelardo@users.noreply.github.com> Date: Thu, 14 Dec 2023 17:34:41 -0500 Subject: [PATCH 1/6] [feat] add in a container to preinstall seed deps (#457) * add in a container to preinstall seed deps * remove v ref from earlier * run poetry install just in case * update docker * Remove checkers to just push a container * Recognize pwd * Recognize pwd * just build, don't push * add dependency * add in src * only one python * just run on cli * do the right indent * install both pythons * ensure running within same context * fix title * remove old dep * try mypy daemon * rm poetry and more parallel * tweaks --- .github/workflows/check.yml | 9 +++------ .gitignore | 1 + docker/seed/Dockerfile | 22 ++++++++++++++++++++++ seed/sdk/seed.yml | 8 +++++--- 4 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 docker/seed/Dockerfile diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 3aeb49541..75a2cc37f 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -48,17 +48,14 @@ jobs: - uses: actions/setup-node@v3 - - name: Install Poetry - uses: snok/install-poetry@v1 - - - name: Install Dependencies - run: poetry install + - name: Build seed docker for test + run: docker build . -f docker/seed/Dockerfile -t fernapi/python-seed - name: Install Seed run: npm install -g @fern-api/seed-cli@0.15.16 - name: Seed Test - run: seed test --workspace sdk --parallel 6 + run: seed test --workspace sdk --parallel 8 - name: Ensure no changes to git-tracked files run: git --no-pager diff --exit-code diff --git a/.gitignore b/.gitignore index a36402ee5..8d75200ac 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ dist/ __pycache__/ poetry.toml .idea/ +.dmypy.json diff --git a/docker/seed/Dockerfile b/docker/seed/Dockerfile new file mode 100644 index 000000000..9b8ef3a78 --- /dev/null +++ b/docker/seed/Dockerfile @@ -0,0 +1,22 @@ +FROM python:3.10 +COPY pyproject.toml ./pyproject.toml +COPY poetry.lock ./poetry.lock +COPY ./src ./src + + +# Setup pyenv +RUN apt-get install -y git +RUN git clone --depth=1 https://github.com/pyenv/pyenv.git .pyenv +ENV PYENV_ROOT="${HOME}/.pyenv" +ENV PATH="${PYENV_ROOT}/shims:${PYENV_ROOT}/bin:${PATH}" + +RUN pyenv install 3.9 +RUN pyenv install 3.8 + +# Setup poetry +RUN pip install poetry &&\ + poetry config virtualenvs.create false &&\ + poetry install + + +CMD [ "poetry" ] diff --git a/seed/sdk/seed.yml b/seed/sdk/seed.yml index a1ab286b8..95d8705cf 100644 --- a/seed/sdk/seed.yml +++ b/seed/sdk/seed.yml @@ -27,7 +27,9 @@ fixtures: boto3: 1.28.57 outputFolder: extra_dependencies scripts: - - docker: mwalbeck/python-poetry:1.7-3.11 + - docker: fernapi/python-seed commands: - - poetry install - - poetry run mypy . + - pyenv global 3.8 + - dmypy run . + - pyenv global 3.9 + - dmypy run . From ffec6e86c53fbfe12b65c60469dccc21dbc05e7d Mon Sep 17 00:00:00 2001 From: Armando Belardo <11140328+armandobelardo@users.noreply.github.com> Date: Thu, 14 Dec 2023 17:43:25 -0500 Subject: [PATCH 2/6] [feat] Only build the seed container on push to main (#460) * add in a container to preinstall seed deps * remove v ref from earlier * run poetry install just in case * update docker * Remove checkers to just push a container * Recognize pwd * Recognize pwd * just build, don't push * add dependency * add in src * only one python * just run on cli * do the right indent * install both pythons * ensure running within same context * fix title * remove old dep * try mypy daemon * rm poetry and more parallel * tweaks * just publish the container on main * add back login, etc --- .github/workflows/check.yml | 3 --- .github/workflows/seed_container.yml | 40 ++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/seed_container.yml diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 75a2cc37f..9d6207e13 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -48,9 +48,6 @@ jobs: - uses: actions/setup-node@v3 - - name: Build seed docker for test - run: docker build . -f docker/seed/Dockerfile -t fernapi/python-seed - - name: Install Seed run: npm install -g @fern-api/seed-cli@0.15.16 diff --git a/.github/workflows/seed_container.yml b/.github/workflows/seed_container.yml new file mode 100644 index 000000000..b5df606b1 --- /dev/null +++ b/.github/workflows/seed_container.yml @@ -0,0 +1,40 @@ +name: Build seed container + +on: + push: + branches: + - main + workflow_dispatch: + +jobs: + compile: + runs-on: ubuntu-latest + steps: + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Log in to Docker Hub + uses: docker/login-action@v3 + with: + username: fernapi + password: ${{ secrets.FERN_API_DOCKERHUB_PASSWORD }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v4 + with: + images: fernapi/python-seed + tags: | + type=sha + latest + + - name: Build and push Docker image + uses: docker/build-push-action@v2 + with: + context: . + file: ./docker/fastapi/Dockerfile + platforms: linux/amd64,linux/arm64 + push: true + # use short SHA if modded, or just use latest if nothing changed + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} From 7ed87b43987e8de4ae278028cb803ede77ef7d0f Mon Sep 17 00:00:00 2001 From: dsinghvi Date: Thu, 14 Dec 2023 18:17:34 -0500 Subject: [PATCH 3/6] fix: seed container is now published --- .github/workflows/seed_container.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/seed_container.yml b/.github/workflows/seed_container.yml index b5df606b1..1e28cceaf 100644 --- a/.github/workflows/seed_container.yml +++ b/.github/workflows/seed_container.yml @@ -10,6 +10,12 @@ jobs: compile: runs-on: ubuntu-latest steps: + - name: Checkout repo + uses: actions/checkout@v4 + with: + fetch-depth: 0 + fetch-tags: true + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 @@ -32,7 +38,7 @@ jobs: uses: docker/build-push-action@v2 with: context: . - file: ./docker/fastapi/Dockerfile + file: ./docker/seed/Dockerfile platforms: linux/amd64,linux/arm64 push: true # use short SHA if modded, or just use latest if nothing changed From 8e57f682d859a2fba56204f442e8aad9065d4de3 Mon Sep 17 00:00:00 2001 From: Deep Singhvi Date: Tue, 19 Dec 2023 10:56:45 -0500 Subject: [PATCH 4/6] feature: reduce import length by getting rid of `resources` directory (#467) get rid of resources packages --- .github/workflows/check.yml | 6 +- seed/fastapi/api-wide-base-path/register.py | 2 +- .../{resources => }/service/__init__.py | 0 .../service/service/__init__.py | 0 .../service/service/service.py | 6 +- seed/fastapi/audiences/__init__.py | 4 +- .../{resources => }/commons/__init__.py | 0 .../{resources => }/commons/types/__init__.py | 0 .../{resources => }/commons/types/imported.py | 2 +- .../resources => folder_a}/__init__.py | 0 .../service/__init__.py | 0 .../service/service/__init__.py | 0 .../service/service/service.py | 6 +- .../service/types/__init__.py | 0 .../folder_a/service/types/response.py | 28 + .../resources => folder_b}/__init__.py | 0 .../resources => folder_b}/common/__init__.py | 0 .../common/types/__init__.py | 0 .../audiences/folder_b/common/types/foo.py | 28 + .../resources => folder_c}/__init__.py | 0 .../resources => folder_c}/common/__init__.py | 0 .../common/types/__init__.py | 0 .../common/types/foo.py | 2 +- .../audiences/{resources => }/foo/__init__.py | 0 .../{resources => }/foo/service/__init__.py | 0 .../{resources => }/foo/service/service.py | 6 +- .../{resources => }/foo/types/__init__.py | 0 .../foo/types/importing_type.py | 2 +- .../foo/types/optional_string.py | 2 +- seed/fastapi/audiences/register.py | 4 +- seed/fastapi/audiences/resources/__init__.py | 7 - .../audiences/resources/folder_a/__init__.py | 5 - .../resources/service/types/response.py | 28 - .../audiences/resources/folder_b/__init__.py | 5 - .../folder_b/resources/common/types/foo.py | 28 - .../audiences/resources/folder_c/__init__.py | 5 - .../auth-environment-variables/register.py | 2 +- .../{resources => }/service/__init__.py | 0 .../service/service/__init__.py | 0 .../service/service/service.py | 8 +- seed/fastapi/basic-auth/__init__.py | 3 +- .../{resources => }/basic_auth/__init__.py | 0 .../basic_auth/service/__init__.py | 0 .../basic_auth/service/service.py | 8 +- .../{resources => }/errors/__init__.py | 0 .../{resources => }/errors/errors/__init__.py | 0 .../errors/errors/bad_request.py | 2 +- .../errors/errors/unauthorized_request.py | 2 +- .../{resources => }/errors/types/__init__.py | 0 .../types/unauthorized_request_error_body.py | 2 +- seed/fastapi/basic-auth/register.py | 2 +- seed/fastapi/basic-auth/resources/__init__.py | 6 - .../register.py | 2 +- .../{resources => }/service/__init__.py | 0 .../service/service/__init__.py | 0 .../service/service/service.py | 8 +- seed/fastapi/circular-references/__init__.py | 4 +- .../{resources => }/a/__init__.py | 0 .../{resources => }/a/types/__init__.py | 0 .../{resources => }/a/types/a.py | 4 +- .../{resources => }/ast/__init__.py | 0 .../{resources => }/ast/types/__init__.py | 0 .../ast/types/container_value.py | 2 +- .../{resources => }/ast/types/field_value.py | 30 +- .../{resources => }/ast/types/object_value.py | 2 +- .../ast/types/primitive_value.py | 0 .../circular-references/resources/__init__.py | 7 - .../circular-references/types/importing_a.py | 2 +- seed/fastapi/custom-auth/__init__.py | 3 +- .../{resources => }/custom_auth/__init__.py | 0 .../custom_auth/service/__init__.py | 0 .../custom_auth/service/service.py | 8 +- .../{resources => }/errors/__init__.py | 0 .../{resources => }/errors/errors/__init__.py | 0 .../errors/errors/bad_request.py | 2 +- .../errors/errors/unauthorized_request.py | 2 +- .../{resources => }/errors/types/__init__.py | 0 .../types/unauthorized_request_error_body.py | 2 +- seed/fastapi/custom-auth/register.py | 2 +- .../fastapi/custom-auth/resources/__init__.py | 6 - seed/fastapi/enum-query-params/__init__.py | 3 +- seed/fastapi/enum-query-params/register.py | 2 +- .../enum-query-params/resources/__init__.py | 6 - .../{resources => }/svc/__init__.py | 0 .../{resources => }/svc/service/__init__.py | 0 .../{resources => }/svc/service/service.py | 6 +- .../{resources => }/svc/types/__init__.py | 0 .../{resources => }/svc/types/my_enum.py | 0 seed/fastapi/error-property/__init__.py | 3 +- .../{resources => }/errors/__init__.py | 0 .../{resources => }/errors/errors/__init__.py | 0 .../errors/property_based_error_test.py | 2 +- .../{resources => }/errors/types/__init__.py | 0 .../types/property_based_error_test_body.py | 2 +- .../property_based_error/__init__.py | 0 .../property_based_error/service/__init__.py | 0 .../property_based_error/service/service.py | 6 +- seed/fastapi/error-property/register.py | 2 +- seed/fastapi/examples/__init__.py | 8 +- .../commons/resources => commons}/__init__.py | 0 .../resources => commons}/types/__init__.py | 0 .../types/types/__init__.py | 0 .../resources => commons}/types/types/data.py | 4 +- .../types/types/event_info.py | 24 +- .../types/types/metadata.py | 4 +- .../resources => commons}/types/types/tag.py | 2 +- .../file/resources => file}/__init__.py | 0 .../notification}/service/__init__.py | 0 .../notification}/service/service/__init__.py | 0 .../notification}/service/service/service.py | 10 +- .../resources => file}/service/__init__.py | 0 .../service/service/__init__.py | 0 .../service/service/service.py | 12 +- .../service/types/__init__.py | 0 .../service/types/filename.py | 2 +- .../resources => health}/service/__init__.py | 0 .../service/service/__init__.py | 0 .../service/service/service.py | 8 +- seed/fastapi/examples/register.py | 10 +- seed/fastapi/examples/resources/__init__.py | 53 -- .../examples/resources/commons/__init__.py | 5 - .../examples/resources/file/__init__.py | 5 - .../service/service/__init__.py | 0 .../service/service/service.py | 6 +- .../{resources => }/types/__init__.py | 0 .../{resources => }/types/errors/__init__.py | 0 .../types}/errors/not_found_error.py | 2 +- .../{resources => }/types/types/__init__.py | 0 .../{resources => }/types/types/actor.py | 2 +- .../{resources => }/types/types/actress.py | 2 +- .../types/types/cast_member.py | 0 .../{resources => }/types/types/directory.py | 2 +- .../{resources => }/types/types/exception.py | 2 +- .../types/types/exception_info.py | 2 +- .../types/types/extended_movie.py | 2 +- .../{resources => }/types/types/file.py | 2 +- .../{resources => }/types/types/metadata.py | 2 +- .../{resources => }/types/types/migration.py | 2 +- .../types/types/migration_status.py | 0 .../{resources => }/types/types/moment.py | 2 +- .../{resources => }/types/types/movie.py | 4 +- .../{resources => }/types/types/movie_id.py | 2 +- .../{resources => }/types/types/node.py | 2 +- .../{resources => }/types/types/request.py | 2 +- .../{resources => }/types/types/response.py | 2 +- .../types/types/stunt_double.py | 2 +- .../{resources => }/types/types/test.py | 2 +- .../{resources => }/types/types/tree.py | 2 +- .../exhaustive/no-custom-config/__init__.py | 4 +- .../endpoints/container}/__init__.py | 0 .../container/service/__init__.py | 0 .../container/service/service.py | 10 +- .../container => endpoints/enum}/__init__.py | 0 .../enum/service/__init__.py | 0 .../endpoints}/enum/service/service.py | 10 +- .../http_methods}/__init__.py | 0 .../http_methods/service/__init__.py | 0 .../http_methods/service/service.py | 12 +- .../object}/__init__.py | 0 .../object/service/__init__.py | 0 .../endpoints}/object/service/service.py | 18 +- .../object => endpoints/params}/__init__.py | 0 .../params/service/__init__.py | 0 .../params/service/service.py | 8 +- .../primitive}/__init__.py | 0 .../primitive/service/__init__.py | 0 .../endpoints}/primitive/service/service.py | 8 +- .../primitive => endpoints/union}/__init__.py | 0 .../union/service/__init__.py | 0 .../endpoints}/union/service/service.py | 10 +- .../general_errors/__init__.py | 0 .../general_errors/errors/__init__.py | 0 .../general_errors/errors/bad_request_body.py | 2 +- .../general_errors/types/__init__.py | 0 .../types/bad_object_request_info.py | 2 +- .../inlined_requests/__init__.py | 0 .../inlined_requests/service/__init__.py | 0 .../service/post_with_object_body.py | 4 +- .../inlined_requests/service/service.py | 8 +- .../resources/union => no_auth}/__init__.py | 0 .../no_auth/service/__init__.py | 0 .../no_auth/service/service.py | 6 +- .../no_auth => no_req_body}/__init__.py | 0 .../no_req_body/service/__init__.py | 0 .../no_req_body/service/service.py | 10 +- .../exhaustive/no-custom-config/register.py | 22 +- .../__init__.py | 0 .../req_with_headers/service/__init__.py | 0 .../req_with_headers/service/service.py | 8 +- .../no-custom-config/resources/__init__.py | 14 - .../resources/types/__init__.py | 43 -- .../types/resources => types}/__init__.py | 0 .../resources => types}/enum/__init__.py | 0 .../enum/errors/__init__.py | 0 .../enum/errors/error_with_enum_body.py | 2 +- .../enum/types/__init__.py | 0 .../enum/types/weather_report.py | 0 .../resources => types}/object/__init__.py | 0 .../object/errors/__init__.py | 0 ...nested_object_with_optional_field_error.py | 2 +- ...nested_object_with_required_field_error.py | 2 +- .../object_with_optional_field_error.py | 2 +- .../object_with_required_field_error.py | 2 +- .../object/types/__init__.py | 0 .../nested_object_with_optional_field.py | 2 +- .../nested_object_with_required_field.py | 2 +- .../object/types/object_with_map_of_map.py | 2 +- .../types/object_with_optional_field.py | 2 +- .../types/object_with_required_field.py | 2 +- .../resources => types}/union/__init__.py | 0 .../union/errors/__init__.py | 0 .../union/errors/error_with_union_body.py | 2 +- .../union/types/__init__.py | 0 .../resources => types}/union/types/animal.py | 30 +- .../resources => types}/union/types/cat.py | 2 +- .../resources => types}/union/types/dog.py | 2 +- .../exhaustive/pydantic-v1/__init__.py | 4 +- .../endpoints/container}/__init__.py | 0 .../container/service/__init__.py | 0 .../endpoints}/container/service/service.py | 10 +- .../container => endpoints/enum}/__init__.py | 0 .../enum/service/__init__.py | 0 .../endpoints}/enum/service/service.py | 10 +- .../http_methods}/__init__.py | 0 .../http_methods/service/__init__.py | 0 .../http_methods/service/service.py | 12 +- .../object}/__init__.py | 0 .../object/service/__init__.py | 0 .../endpoints}/object/service/service.py | 18 +- .../object => endpoints/params}/__init__.py | 0 .../params/service/__init__.py | 0 .../endpoints}/params/service/service.py | 8 +- .../primitive}/__init__.py | 0 .../primitive/service/__init__.py | 0 .../endpoints}/primitive/service/service.py | 8 +- .../primitive => endpoints/union}/__init__.py | 0 .../union/service/__init__.py | 0 .../endpoints}/union/service/service.py | 10 +- .../general_errors/__init__.py | 0 .../general_errors/errors/__init__.py | 0 .../general_errors/errors/bad_request_body.py | 2 +- .../general_errors/types/__init__.py | 0 .../types/bad_object_request_info.py | 2 +- .../inlined_requests/__init__.py | 0 .../inlined_requests/service/__init__.py | 0 .../service/post_with_object_body.py | 4 +- .../inlined_requests/service/service.py | 8 +- .../resources/union => no_auth}/__init__.py | 0 .../no_auth/service/__init__.py | 0 .../no_auth/service/service.py | 6 +- .../no_auth => no_req_body}/__init__.py | 0 .../no_req_body/service/__init__.py | 0 .../no_req_body/service/service.py | 10 +- .../exhaustive/pydantic-v1/register.py | 22 +- .../__init__.py | 0 .../req_with_headers/service/__init__.py | 0 .../req_with_headers/service/service.py | 8 +- .../pydantic-v1/resources/__init__.py | 14 - .../pydantic-v1/resources/types/__init__.py | 43 -- .../types/resources => types}/__init__.py | 0 .../resources => types}/enum/__init__.py | 0 .../enum/errors/__init__.py | 0 .../enum/errors/error_with_enum_body.py | 2 +- .../enum/types/__init__.py | 0 .../enum/types/weather_report.py | 0 .../resources => types}/object/__init__.py | 0 .../object/errors/__init__.py | 0 ...nested_object_with_optional_field_error.py | 2 +- ...nested_object_with_required_field_error.py | 2 +- .../object_with_optional_field_error.py | 2 +- .../object_with_required_field_error.py | 2 +- .../object/types/__init__.py | 0 .../nested_object_with_optional_field.py | 2 +- .../nested_object_with_required_field.py | 2 +- .../object/types/object_with_map_of_map.py | 2 +- .../types/object_with_optional_field.py | 2 +- .../types/object_with_required_field.py | 2 +- .../resources => types}/union/__init__.py | 0 .../union/errors/__init__.py | 0 .../union/errors/error_with_union_body.py | 2 +- .../union/types/__init__.py | 0 .../resources => types}/union/types/animal.py | 30 +- .../resources => types}/union/types/cat.py | 2 +- .../resources => types}/union/types/dog.py | 2 +- .../exhaustive/pydantic-v2/__init__.py | 4 +- .../endpoints/container}/__init__.py | 0 .../container/service/__init__.py | 0 .../endpoints}/container/service/service.py | 10 +- .../container => endpoints/enum}/__init__.py | 0 .../enum/service/__init__.py | 0 .../endpoints}/enum/service/service.py | 10 +- .../http_methods}/__init__.py | 0 .../http_methods/service/__init__.py | 0 .../http_methods/service/service.py | 12 +- .../object}/__init__.py | 0 .../object/service/__init__.py | 0 .../endpoints}/object/service/service.py | 18 +- .../object => endpoints/params}/__init__.py | 0 .../params/service/__init__.py | 0 .../endpoints}/params/service/service.py | 8 +- .../primitive}/__init__.py | 0 .../primitive/service/__init__.py | 0 .../endpoints}/primitive/service/service.py | 8 +- .../primitive => endpoints/union}/__init__.py | 0 .../union/service/__init__.py | 0 .../endpoints}/union/service/service.py | 10 +- .../general_errors/__init__.py | 0 .../general_errors/errors/__init__.py | 0 .../general_errors/errors/bad_request_body.py | 2 +- .../general_errors/types/__init__.py | 0 .../types/bad_object_request_info.py | 2 +- .../inlined_requests/__init__.py | 0 .../inlined_requests/service/__init__.py | 0 .../service/post_with_object_body.py | 4 +- .../inlined_requests/service/service.py | 8 +- .../resources/union => no_auth}/__init__.py | 0 .../no_auth/service/__init__.py | 0 .../no_auth/service/service.py | 6 +- .../no_auth => no_req_body}/__init__.py | 0 .../no_req_body/service/__init__.py | 0 .../no_req_body/service/service.py | 10 +- .../exhaustive/pydantic-v2/register.py | 22 +- .../__init__.py | 0 .../req_with_headers/service/__init__.py | 0 .../req_with_headers/service/service.py | 8 +- .../pydantic-v2/resources/__init__.py | 14 - .../pydantic-v2/resources/types/__init__.py | 43 -- .../types/resources => types}/__init__.py | 0 .../resources => types}/enum/__init__.py | 0 .../enum/errors/__init__.py | 0 .../enum/errors/error_with_enum_body.py | 2 +- .../enum/types/__init__.py | 0 .../enum/types/weather_report.py | 0 .../resources => types}/object/__init__.py | 0 .../object/errors/__init__.py | 0 ...nested_object_with_optional_field_error.py | 2 +- ...nested_object_with_required_field_error.py | 2 +- .../object_with_optional_field_error.py | 2 +- .../object_with_required_field_error.py | 2 +- .../object/types/__init__.py | 0 .../nested_object_with_optional_field.py | 2 +- .../nested_object_with_required_field.py | 2 +- .../object/types/object_with_map_of_map.py | 2 +- .../types/object_with_optional_field.py | 2 +- .../types/object_with_required_field.py | 2 +- .../resources => types}/union/__init__.py | 0 .../union/errors/__init__.py | 0 .../union/errors/error_with_union_body.py | 2 +- .../union/types/__init__.py | 0 .../resources => types}/union/types/animal.py | 30 +- .../resources => types}/union/types/cat.py | 2 +- .../resources => types}/union/types/dog.py | 2 +- .../exhaustive/skip-formatting/__init__.py | 4 +- .../endpoints/container}/__init__.py | 0 .../container/service/__init__.py | 0 .../container/service/service.py | 12 +- .../container => endpoints/enum}/__init__.py | 0 .../enum/service/__init__.py | 0 .../enum/service/service.py | 12 +- .../http_methods}/__init__.py | 0 .../http_methods/service/__init__.py | 0 .../http_methods/service/service.py | 14 +- .../object}/__init__.py | 0 .../object/service/__init__.py | 0 .../object/service/service.py | 20 +- .../object => endpoints/params}/__init__.py | 0 .../params/service/__init__.py | 0 .../params/service/service.py | 10 +- .../primitive}/__init__.py | 0 .../primitive/service/__init__.py | 0 .../primitive/service/service.py | 10 +- .../primitive => endpoints/union}/__init__.py | 0 .../union/service/__init__.py | 0 .../union/service/service.py | 12 +- .../general_errors/__init__.py | 0 .../general_errors/errors/__init__.py | 0 .../general_errors/errors/bad_request_body.py | 2 +- .../general_errors/types/__init__.py | 0 .../types/bad_object_request_info.py | 2 +- .../inlined_requests/__init__.py | 0 .../inlined_requests/service/__init__.py | 0 .../service/post_with_object_body.py | 4 +- .../inlined_requests/service/service.py | 8 +- .../resources/union => no_auth}/__init__.py | 0 .../no_auth/service/__init__.py | 0 .../no_auth/service/service.py | 6 +- .../no_auth => no_req_body}/__init__.py | 0 .../no_req_body/service/__init__.py | 0 .../no_req_body/service/service.py | 12 +- .../exhaustive/skip-formatting/register.py | 22 +- .../__init__.py | 0 .../req_with_headers/service/__init__.py | 0 .../req_with_headers/service/service.py | 10 +- .../skip-formatting/resources/__init__.py | 6 - .../resources/types/__init__.py | 4 - .../types/resources => types}/__init__.py | 0 .../resources => types}/enum/__init__.py | 0 .../enum/errors/__init__.py | 0 .../enum/errors/error_with_enum_body.py | 2 +- .../enum/types/__init__.py | 0 .../enum/types/weather_report.py | 0 .../resources => types}/object/__init__.py | 0 .../object/errors/__init__.py | 0 ...nested_object_with_optional_field_error.py | 2 +- ...nested_object_with_required_field_error.py | 2 +- .../object_with_optional_field_error.py | 2 +- .../object_with_required_field_error.py | 2 +- .../object/types/__init__.py | 0 .../nested_object_with_optional_field.py | 2 +- .../nested_object_with_required_field.py | 2 +- .../object/types/object_with_map_of_map.py | 2 +- .../types/object_with_optional_field.py | 2 +- .../types/object_with_required_field.py | 2 +- .../resources => types}/union/__init__.py | 0 .../union/errors/__init__.py | 0 .../union/errors/error_with_union_body.py | 2 +- .../union/types/__init__.py | 0 .../resources => types}/union/types/animal.py | 20 +- .../resources => types}/union/types/cat.py | 2 +- .../resources => types}/union/types/dog.py | 2 +- seed/fastapi/folders/__init__.py | 2 +- .../{resources/a/resources => a}/__init__.py | 0 .../a/b}/__init__.py | 0 .../a/resources => a}/b/service/__init__.py | 0 .../a/resources => a}/b/service/service.py | 6 +- .../a/resources/b => a/c}/__init__.py | 0 .../a/resources => a}/c/service/__init__.py | 0 .../a/resources => a}/c/service/service.py | 6 +- .../resources/d/resources => a/d}/__init__.py | 0 .../d/resources => a/d}/types/__init__.py | 0 .../resources => a/d}/types/types/__init__.py | 0 .../d/resources => a/d}/types/types/foo.py | 2 +- .../folder/resources => folder}/__init__.py | 0 .../folder/service/__init__.py | 3 +- .../service/errors/__init__.py | 0 .../folder/service}/errors/not_found_error.py | 0 .../{resources => }/folder/service/service.py | 6 +- .../service/service/__init__.py | 0 .../service/service/service.py | 6 +- seed/fastapi/folders/register.py | 8 +- seed/fastapi/folders/resources/__init__.py | 5 - seed/fastapi/folders/resources/a/__init__.py | 5 - .../resources/a/resources/d/__init__.py | 5 - .../folders/resources/folder/__init__.py | 5 - .../folder/resources/service/__init__.py | 5 - seed/fastapi/idempotency-headers/__init__.py | 3 +- .../{resources => }/payment/__init__.py | 0 .../payment/service/__init__.py | 0 .../payment/service/create_payment_request.py | 2 +- .../payment/service/service.py | 8 +- .../{resources => }/payment/types/__init__.py | 0 .../{resources => }/payment/types/currency.py | 0 seed/fastapi/idempotency-headers/register.py | 2 +- .../idempotency-headers/resources/__init__.py | 6 - seed/fastapi/imdb/__init__.py | 3 +- .../imdb/{resources => }/imdb/__init__.py | 0 .../{resources => }/imdb/errors/__init__.py | 0 .../imdb/errors/movie_does_not_exist_error.py | 2 +- .../{resources => }/imdb/service/__init__.py | 0 .../{resources => }/imdb/service/service.py | 6 +- .../{resources => }/imdb/types/__init__.py | 0 .../imdb/types/create_movie_request.py | 2 +- .../imdb/{resources => }/imdb/types/movie.py | 2 +- .../{resources => }/imdb/types/movie_id.py | 2 +- seed/fastapi/imdb/register.py | 2 +- seed/fastapi/imdb/resources/__init__.py | 6 - seed/fastapi/literal/__init__.py | 4 +- .../{resources => }/literal/__init__.py | 0 .../literal/service/__init__.py | 0 .../literal/service/create_options_request.py | 2 +- .../literal/service/get_options_request.py | 2 +- .../get_undiscriminated_options_request.py | 2 +- .../literal/service/service.py | 6 +- .../{resources => }/literal/types/__init__.py | 0 .../literal/types/create_options_response.py | 14 +- .../{resources => }/literal/types/options.py | 2 +- .../literal/types/undiscriminated_options.py | 0 seed/fastapi/literal/register.py | 2 +- seed/fastapi/literal/resources/__init__.py | 21 - .../fastapi/multi-url-environment/__init__.py | 4 +- .../{resources => }/ec_2/__init__.py | 0 .../{resources => }/ec_2/service/__init__.py | 0 .../ec_2/service/boot_instance_request.py | 2 +- .../{resources => }/ec_2/service/service.py | 8 +- .../fastapi/multi-url-environment/register.py | 4 +- .../resources/__init__.py | 7 - .../{resources => }/s_3/__init__.py | 0 .../{resources => }/s_3/service/__init__.py | 0 .../s_3/service/get_presigned_url_request.py | 2 +- .../{resources => }/s_3/service/service.py | 8 +- .../c => no-environment/dummy}/__init__.py | 0 .../{resources => }/dummy/service/__init__.py | 0 .../dummy/service/service.py | 8 +- seed/fastapi/no-environment/register.py | 2 +- seed/fastapi/objects-with-imports/__init__.py | 3 +- .../commons/resources => commons}/__init__.py | 0 .../metadata/__init__.py | 0 .../metadata/types/__init__.py | 0 .../metadata/types/metadata.py | 4 +- .../{resources => }/file/__init__.py | 3 +- .../resources => file}/directory/__init__.py | 0 .../directory/types/__init__.py | 0 .../directory/types/directory.py | 6 +- .../{resources => }/file/types/__init__.py | 0 .../{resources => }/file/types/file.py | 2 +- .../{resources => }/file/types/file_info.py | 0 .../resources/__init__.py | 6 - .../resources/commons/__init__.py | 5 - .../objects-with-imports/types/node.py | 4 +- .../objects-with-imports/types/tree.py | 2 +- .../resources/dummy => optional}/__init__.py | 0 seed/fastapi/optional/core/__init__.py | 23 + .../optional/core/abstract_fern_service.py | 11 + seed/fastapi/optional/core/datetime_utils.py | 28 + .../optional/core/exceptions/__init__.py | 13 + .../core/exceptions/fern_http_exception.py | 20 + .../optional/core/exceptions/handlers.py | 32 ++ .../optional/core/exceptions/unauthorized.py | 15 + seed/fastapi/optional/core/route_args.py | 63 +++ .../optional/core/security}/__init__.py | 4 +- seed/fastapi/optional/core/security/bearer.py | 22 + .../service => optional/optional}/__init__.py | 0 .../optional/optional/service/__init__.py | 5 + .../optional/optional/service/service.py | 72 +++ seed/fastapi/optional/register.py | 44 ++ seed/fastapi/optional/snippet.json | 0 seed/fastapi/package-yml/register.py | 2 +- .../service/service/__init__.py | 0 .../service/service/service.py | 6 +- seed/fastapi/plain-text/register.py | 2 +- .../{resources => }/service/__init__.py | 0 .../service/service/__init__.py | 0 .../service/service/service.py | 6 +- seed/fastapi/reserved-keywords/__init__.py | 3 +- .../{resources => }/package/__init__.py | 0 .../package/service/__init__.py | 0 .../package/service/service.py | 6 +- .../{resources => }/package/types/__init__.py | 0 .../{resources => }/package/types/package.py | 2 +- .../{resources => }/package/types/record.py | 2 +- seed/fastapi/reserved-keywords/register.py | 2 +- .../reserved-keywords/resources/__init__.py | 6 - seed/fastapi/seed.yml | 7 + .../{resources => }/dummy/__init__.py | 0 .../{resources => }/dummy/service/__init__.py | 0 .../dummy/service/service.py | 8 +- .../register.py | 2 +- .../{resources => }/dummy/__init__.py | 0 .../{resources => }/dummy/service/__init__.py | 0 .../{resources => }/dummy/service/service.py | 8 +- .../register.py | 2 +- seed/fastapi/trace/__init__.py | 113 ++-- .../trace/{resources => }/admin/__init__.py | 0 .../{resources => }/admin/service/__init__.py | 0 .../{resources => }/admin/service/service.py | 6 +- .../service/store_traced_test_case_request.py | 2 +- .../service/store_traced_workspace_request.py | 2 +- .../{resources => }/admin/types/__init__.py | 0 .../trace/{resources => }/admin/types/test.py | 2 +- .../trace/{resources => }/commons/__init__.py | 0 .../{resources => }/commons/types/__init__.py | 0 .../types/binary_tree_node_and_tree_value.py | 2 +- .../commons/types/binary_tree_node_value.py | 2 +- .../commons/types/binary_tree_value.py | 2 +- .../commons/types/debug_key_value_pairs.py | 2 +- .../commons/types/debug_map_value.py | 2 +- .../commons/types/debug_variable_value.py | 14 +- .../doubly_linked_list_node_and_list_value.py | 2 +- .../types/doubly_linked_list_node_value.py | 2 +- .../commons/types/doubly_linked_list_value.py | 2 +- .../commons/types/file_info.py | 2 +- .../commons/types/generic_value.py | 2 +- .../commons/types/key_value_pair.py | 2 +- .../{resources => }/commons/types/language.py | 0 .../commons/types/list_type.py | 2 +- .../{resources => }/commons/types/map_type.py | 2 +- .../commons/types/map_value.py | 2 +- .../{resources => }/commons/types/node_id.py | 2 +- .../commons/types/problem_id.py | 2 +- .../singly_linked_list_node_and_list_value.py | 2 +- .../types/singly_linked_list_node_value.py | 2 +- .../commons/types/singly_linked_list_value.py | 2 +- .../commons/types/test_case.py | 2 +- .../types/test_case_with_expected_result.py | 2 +- .../{resources => }/commons/types/user_id.py | 2 +- .../commons/types/variable_type.py | 32 +- .../commons/types/variable_value.py | 46 +- .../{resources => }/homepage/__init__.py | 0 .../homepage/service/__init__.py | 0 .../homepage/service/service.py | 6 +- .../{resources => }/lang_server/__init__.py | 0 .../lang_server/types/__init__.py | 0 .../lang_server/types/lang_server_request.py | 2 +- .../lang_server/types/lang_server_response.py | 2 +- .../{resources => }/migration/__init__.py | 0 .../migration/service/__init__.py | 0 .../migration/service/service.py | 6 +- .../migration/types/__init__.py | 0 .../migration/types/migration.py | 2 +- .../migration/types/migration_status.py | 0 .../{resources => }/playlist/__init__.py | 0 .../playlist/errors/__init__.py | 0 .../errors/playlist_id_not_found_error.py | 2 +- .../playlist/errors/unauthorized_error.py | 2 +- .../playlist/service/__init__.py | 0 .../playlist/service/service.py | 13 +- .../playlist/types/__init__.py | 0 .../playlist/types/playlist.py | 2 +- .../playlist/types/playlist_create_request.py | 2 +- .../playlist/types/playlist_id.py | 2 +- .../types/playlist_id_not_found_error_body.py | 12 +- .../playlist/types/reserved_keyword_enum.py | 0 .../playlist/types/update_playlist_request.py | 2 +- .../trace/{resources => }/problem/__init__.py | 0 .../problem/service/__init__.py | 0 .../get_default_starter_files_request.py | 2 +- .../problem/service/service.py | 6 +- .../{resources => }/problem/types/__init__.py | 0 .../problem/types/create_problem_error.py | 2 +- .../problem/types/create_problem_request.py | 2 +- .../problem/types/create_problem_response.py | 2 +- .../types/generic_create_problem_error.py | 2 +- .../get_default_starter_files_response.py | 2 +- .../problem/types/problem_description.py | 2 +- .../types/problem_description_board.py | 2 +- .../problem/types/problem_files.py | 2 +- .../problem/types/problem_info.py | 2 +- .../problem/types/update_problem_response.py | 2 +- .../problem/types/variable_type_and_name.py | 2 +- seed/fastapi/trace/register.py | 20 +- seed/fastapi/trace/resources/__init__.py | 284 ---------- seed/fastapi/trace/resources/v_2/__init__.py | 93 ---- .../resources/v_2/resources/v_3/__init__.py | 91 --- .../{resources => }/submission/__init__.py | 0 .../submission/service/__init__.py | 0 .../submission/service/service.py | 6 +- .../submission/types/__init__.py | 0 .../submission/types/actual_result.py | 10 +- .../types/building_executor_response.py | 2 +- .../submission/types/code_execution_update.py | 2 +- .../submission/types/compile_error.py | 2 +- .../types/custom_test_cases_unsupported.py | 2 +- .../submission/types/error_info.py | 36 +- .../submission/types/errored_response.py | 2 +- .../submission/types/exception_info.py | 2 +- .../submission/types/exception_v_2.py | 2 +- .../types/execution_session_response.py | 2 +- .../types/execution_session_state.py | 4 +- .../types/execution_session_status.py | 0 .../types/existing_submission_executing.py | 2 +- .../submission/types/expression_location.py | 2 +- .../submission/types/finished_response.py | 2 +- .../get_execution_session_state_response.py | 2 +- .../types/get_submission_state_response.py | 2 +- .../types/get_trace_responses_page_request.py | 2 +- .../submission/types/graded_response.py | 2 +- .../submission/types/graded_response_v_2.py | 4 +- .../types/graded_test_case_update.py | 4 +- .../types/initialize_problem_request.py | 2 +- .../submission/types/internal_error.py | 2 +- .../submission/types/invalid_request_cause.py | 24 +- .../types/invalid_request_response.py | 2 +- .../lightweight_stackframe_information.py | 2 +- .../types/recorded_response_notification.py | 2 +- .../types/recorded_test_case_update.py | 4 +- .../types/recording_response_notification.py | 2 +- .../submission/types/running_response.py | 2 +- .../types/running_submission_state.py | 0 .../submission/types/runtime_error.py | 2 +- .../{resources => }/submission/types/scope.py | 2 +- .../submission/types/share_id.py | 2 +- .../submission/types/stack_frame.py | 2 +- .../submission/types/stack_information.py | 2 +- .../submission/types/stderr_response.py | 2 +- .../submission/types/stdout_response.py | 2 +- .../submission/types/stop_request.py | 2 +- .../submission/types/stopped_response.py | 2 +- .../submission/types/submission_file_info.py | 2 +- .../submission/types/submission_id.py | 2 +- .../types/submission_id_not_found.py | 2 +- .../submission/types/submission_request.py | 12 +- .../submission/types/submission_response.py | 14 +- .../types/submission_status_for_test_case.py | 2 +- .../submission/types/submission_status_v_2.py | 2 +- .../submission/types/submission_type_enum.py | 0 .../submission/types/submission_type_state.py | 2 +- .../submission/types/submit_request_v_2.py | 2 +- .../submission/types/terminated_response.py | 2 +- .../submission/types/test_case_grade.py | 2 +- .../types/test_case_hidden_grade.py | 2 +- .../types/test_case_non_hidden_grade.py | 2 +- .../submission/types/test_case_result.py | 2 +- .../types/test_case_result_with_stdout.py | 2 +- .../submission/types/test_submission_state.py | 2 +- .../types/test_submission_status.py | 2 +- .../types/test_submission_status_v_2.py | 4 +- .../types/test_submission_update.py | 2 +- .../types/test_submission_update_info.py | 2 +- .../submission/types/trace_response.py | 2 +- .../submission/types/trace_response_v_2.py | 2 +- .../submission/types/trace_responses_page.py | 2 +- .../types/trace_responses_page_v_2.py | 2 +- .../submission/types/traced_file.py | 2 +- .../submission/types/traced_test_case.py | 2 +- .../types/unexpected_language_error.py | 2 +- .../submission/types/workspace_files.py | 2 +- .../types/workspace_ran_response.py | 2 +- .../submission/types/workspace_run_details.py | 2 +- .../types/workspace_starter_files_response.py | 2 +- .../workspace_starter_files_response_v_2.py | 4 +- .../types/workspace_submission_state.py | 2 +- .../types/workspace_submission_status.py | 2 +- .../types/workspace_submission_status_v_2.py | 2 +- .../types/workspace_submission_update.py | 2 +- .../types/workspace_submission_update_info.py | 2 +- .../types/workspace_submit_request.py | 2 +- .../types/workspace_traced_update.py | 2 +- .../trace/{resources => }/sysprop/__init__.py | 0 .../sysprop/service/__init__.py | 0 .../sysprop/service/service.py | 6 +- .../v_2/resources => v_2}/__init__.py | 0 .../v_2/resources => v_2}/problem/__init__.py | 0 .../problem/service/__init__.py | 0 .../problem/service/service.py | 6 +- .../problem/types/__init__.py | 0 .../problem/types/assert_correctness_check.py | 2 +- .../problem/types/basic_custom_files.py | 4 +- .../problem/types/basic_test_case_template.py | 2 +- .../types/create_problem_request_v_2.py | 6 +- .../problem/types/custom_files.py | 4 +- .../types/deep_equality_correctness_check.py | 2 +- .../problem/types/default_provided_file.py | 4 +- .../problem/types/file_info_v_2.py | 2 +- .../resources => v_2}/problem/types/files.py | 2 +- .../problem/types/function_implementation.py | 2 +- ...n_implementation_for_multiple_languages.py | 4 +- .../problem/types/function_signature.py | 2 +- .../problem/types/generated_files.py | 4 +- .../types/get_basic_solution_file_request.py | 2 +- .../types/get_basic_solution_file_response.py | 4 +- .../types/get_function_signature_request.py | 2 +- .../types/get_function_signature_response.py | 4 +- .../get_generated_test_case_file_request.py | 2 +- ...nerated_test_case_template_file_request.py | 2 +- .../types/lightweight_problem_info_v_2.py | 6 +- .../types/non_void_function_definition.py | 2 +- .../types/non_void_function_signature.py | 4 +- .../problem/types/parameter.py | 4 +- .../problem/types/parameter_id.py | 2 +- .../problem/types/problem_info_v_2.py | 8 +- .../problem/types/test_case_expects.py | 2 +- .../problem/types/test_case_function.py | 2 +- .../problem/types/test_case_id.py | 2 +- .../problem/types/test_case_implementation.py | 2 +- .../test_case_implementation_description.py | 2 +- ...t_case_implementation_description_board.py | 2 +- .../test_case_implementation_reference.py | 2 +- .../problem/types/test_case_metadata.py | 2 +- .../problem/types/test_case_template.py | 2 +- .../problem/types/test_case_template_id.py | 2 +- .../problem/types/test_case_v_2.py | 4 +- ..._case_with_actual_result_implementation.py | 2 +- .../problem/types/void_function_definition.py | 2 +- ...ion_definition_that_takes_actual_result.py | 2 +- .../problem/types/void_function_signature.py | 2 +- ...tion_signature_that_takes_actual_result.py | 4 +- .../{resources => }/v_2/service/__init__.py | 0 .../{resources => }/v_2/service/service.py | 6 +- .../v_3/resources => v_2/v_3}/__init__.py | 0 .../resources => v_2/v_3}/problem/__init__.py | 0 .../v_3}/problem/service/__init__.py | 0 .../v_3}/problem/service/service.py | 6 +- .../v_3}/problem/types/__init__.py | 0 .../problem/types/assert_correctness_check.py | 2 +- .../v_3}/problem/types/basic_custom_files.py | 2 +- .../problem/types/basic_test_case_template.py | 2 +- .../types/create_problem_request_v_2.py | 2 +- .../v_3}/problem/types/custom_files.py | 2 +- .../types/deep_equality_correctness_check.py | 2 +- .../problem/types/default_provided_file.py | 2 +- .../v_3}/problem/types/file_info_v_2.py | 2 +- .../v_3}/problem/types/files.py | 2 +- .../problem/types/function_implementation.py | 2 +- ...n_implementation_for_multiple_languages.py | 2 +- .../v_3}/problem/types/function_signature.py | 2 +- .../v_3}/problem/types/generated_files.py | 2 +- .../types/get_basic_solution_file_request.py | 2 +- .../types/get_basic_solution_file_response.py | 2 +- .../types/get_function_signature_request.py | 2 +- .../types/get_function_signature_response.py | 2 +- .../get_generated_test_case_file_request.py | 2 +- ...nerated_test_case_template_file_request.py | 2 +- .../types/lightweight_problem_info_v_2.py | 2 +- .../types/non_void_function_definition.py | 2 +- .../types/non_void_function_signature.py | 2 +- .../v_3}/problem/types/parameter.py | 2 +- .../v_3}/problem/types/parameter_id.py | 2 +- .../v_3}/problem/types/problem_info_v_2.py | 2 +- .../v_3}/problem/types/test_case_expects.py | 2 +- .../v_3}/problem/types/test_case_function.py | 2 +- .../v_3}/problem/types/test_case_id.py | 2 +- .../problem/types/test_case_implementation.py | 2 +- .../test_case_implementation_description.py | 2 +- ...t_case_implementation_description_board.py | 2 +- .../test_case_implementation_reference.py | 2 +- .../v_3}/problem/types/test_case_metadata.py | 2 +- .../v_3}/problem/types/test_case_template.py | 2 +- .../problem/types/test_case_template_id.py | 2 +- .../v_3}/problem/types/test_case_v_2.py | 2 +- ..._case_with_actual_result_implementation.py | 2 +- .../problem/types/void_function_definition.py | 2 +- ...ion_definition_that_takes_actual_result.py | 2 +- .../problem/types/void_function_signature.py | 2 +- ...tion_signature_that_takes_actual_result.py | 2 +- .../undiscriminated-unions/__init__.py | 3 +- .../undiscriminated-unions/register.py | 2 +- .../resources/__init__.py | 6 - .../{resources => }/union/__init__.py | 0 .../{resources => }/union/service/__init__.py | 0 .../{resources => }/union/service/service.py | 6 +- .../{resources => }/union/types/__init__.py | 0 .../{resources => }/union/types/my_union.py | 0 seed/fastapi/unknown/__init__.py | 3 +- seed/fastapi/unknown/register.py | 2 +- seed/fastapi/unknown/resources/__init__.py | 6 - .../{resources => }/unknown/__init__.py | 0 .../unknown/service/__init__.py | 0 .../unknown/service/service.py | 6 +- .../{resources => }/unknown/types/__init__.py | 0 .../{resources => }/unknown/types/my_alias.py | 2 +- .../unknown/types/my_object.py | 2 +- seed/fastapi/variables/register.py | 2 +- .../{resources => }/service/__init__.py | 0 .../service/service/__init__.py | 0 .../service/service/service.py | 6 +- .../resources/commons/resources/types/data.py | 2 +- .../commons/resources/types/event_info.py | 2 +- .../commons/resources/types/metadata.py | 2 +- .../src/seed/objects_with_imports/node.py | 2 +- .../commons/resources/metadata/metadata.py | 2 +- .../file/resources/directory/directory.py | 2 +- .../src/seed/objects_with_imports/tree.py | 2 +- .../optional/.github/workflows/ci.yml | 36 ++ seed/pydantic/optional/.gitignore | 4 + seed/pydantic/optional/README.md | 0 seed/pydantic/optional/poetry.lock | 255 +++++++++ seed/pydantic/optional/pyproject.toml | 20 + seed/pydantic/optional/snippet.json | 0 .../seed/objects_with_imports}/__init__.py | 0 .../objects_with_imports/core/__init__.py | 5 + .../core/datetime_utils.py | 28 + .../src/seed/objects_with_imports/py.typed | 0 seed/pydantic/optional/tests/__init__.py | 0 seed/pydantic/optional/tests/test_client.py | 6 + seed/pydantic/seed.yml | 2 + .../submission/execution_session_state.py | 2 +- seed/sdk/alias/src/seed/__init__.py | 4 +- seed/sdk/alias/src/seed/{types => }/object.py | 0 seed/sdk/alias/src/seed/{types => }/type.py | 2 +- .../sdk/alias/src/seed/{types => }/type_id.py | 0 seed/sdk/alias/src/seed/types/__init__.py | 7 - .../api-wide-base-path/src/seed/__init__.py | 2 +- .../sdk/api-wide-base-path/src/seed/client.py | 2 +- .../src/seed}/service/__init__.py | 0 .../service/client.py => service/_client.py} | 4 +- seed/sdk/audiences/src/seed/__init__.py | 4 +- seed/sdk/audiences/src/seed/client.py | 4 +- .../commons/types => commons}/__init__.py | 0 .../commons/types => commons}/imported.py | 0 .../resources => folder_a}/__init__.py | 0 .../client.py => folder_a/_client.py} | 4 +- .../types => folder_a/service}/__init__.py | 0 .../client.py => folder_a/service/_client.py} | 6 +- .../types => folder_a/service}/response.py | 4 +- .../resources => folder_b}/__init__.py | 0 .../types => folder_b/common}/__init__.py | 0 .../audiences/src/seed/folder_b/common/foo.py | 29 + .../resources => folder_c}/__init__.py | 0 .../types => folder_c/common}/__init__.py | 0 .../common/types => folder_c/common}/foo.py | 2 +- .../{resources/foo/types => foo}/__init__.py | 0 .../foo/client.py => foo/_client.py} | 10 +- .../foo/types => foo}/importing_type.py | 4 +- .../foo/types => foo}/optional_string.py | 0 .../audiences/src/seed/resources/__init__.py | 7 - .../src/seed/resources/commons/__init__.py | 5 - .../src/seed/resources/folder_a/__init__.py | 5 - .../src/seed/resources/folder_b/__init__.py | 5 - .../folder_b/resources/common/types/foo.py | 29 - .../src/seed/resources/folder_c/__init__.py | 5 - .../folder_c/resources/common/__init__.py | 5 - .../src/seed/resources/foo/__init__.py | 5 - .../src/seed/__init__.py | 2 +- .../src/seed/client.py | 2 +- .../src/seed/service}/__init__.py | 0 .../service/client.py => service/_client.py} | 4 +- seed/sdk/basic-auth/src/seed/__init__.py | 3 +- .../src/seed/basic_auth}/__init__.py | 0 .../client.py => basic_auth/_client.py} | 12 +- seed/sdk/basic-auth/src/seed/client.py | 2 +- .../{resources/errors => }/errors/__init__.py | 3 +- .../src/seed}/errors/bad_request.py | 2 +- .../errors/unauthorized_request.py | 4 +- .../unauthorized_request_error_body.py | 2 +- .../basic-auth/src/seed/resources/__init__.py | 6 - .../src/seed/resources/errors/__init__.py | 6 - .../seed/resources/errors/types/__init__.py | 5 - .../src/seed/__init__.py | 2 +- .../src/seed/client.py | 2 +- .../src/seed/resources/__init__.py | 5 - .../src/seed}/service/__init__.py | 0 .../service/client.py => service/_client.py} | 4 +- seed/sdk/bytes/src/seed/__init__.py | 2 +- seed/sdk/bytes/src/seed/client.py | 2 +- seed/sdk/bytes/src/seed/resources/__init__.py | 5 - .../src/seed/service}/__init__.py | 0 .../service/client.py => service/_client.py} | 4 +- .../circular-references/src/seed/__init__.py | 10 +- .../seed/{resources/a/types => a}/__init__.py | 0 .../src/seed/{resources/a/types => a}/a.py | 4 +- .../{resources/ast/types => ast}/__init__.py | 0 .../ast/types => ast}/container_value.py | 0 .../ast/types => ast}/field_value.py | 0 .../ast/types => ast}/object_value.py | 2 +- .../ast/types => ast}/primitive_value.py | 0 .../src/seed/{types => }/importing_a.py | 4 +- .../src/seed/resources/__init__.py | 30 - .../src/seed/resources/ast/__init__.py | 25 - .../src/seed/{types => }/root_type.py | 2 +- .../src/seed/types/__init__.py | 6 - seed/sdk/custom-auth/src/seed/__init__.py | 3 +- seed/sdk/custom-auth/src/seed/client.py | 2 +- .../src/seed/custom_auth}/__init__.py | 0 .../client.py => custom_auth/_client.py} | 12 +- .../{resources/errors => }/errors/__init__.py | 3 +- .../src/seed}/errors/bad_request.py | 2 +- .../errors/unauthorized_request.py | 4 +- .../unauthorized_request_error_body.py | 2 +- .../src/seed/resources/__init__.py | 6 - .../src/seed/resources/errors/__init__.py | 6 - .../seed/resources/errors/types/__init__.py | 5 - .../enum-query-params/src/seed/__init__.py | 3 +- seed/sdk/enum-query-params/src/seed/client.py | 2 +- .../src/seed/resources/__init__.py | 6 - .../src/seed/resources/svc/__init__.py | 5 - .../{resources/svc/types => svc}/__init__.py | 0 .../svc/client.py => svc/_client.py} | 8 +- .../{resources/svc/types => svc}/my_enum.py | 0 seed/sdk/error-property/src/seed/__init__.py | 3 +- seed/sdk/error-property/src/seed/client.py | 2 +- .../src/seed/errors}/__init__.py | 6 +- .../errors/property_based_error_test.py | 4 +- .../property_based_error_test_body.py | 2 +- .../seed/property_based_error}/__init__.py | 0 .../_client.py} | 8 +- .../src/seed/resources/__init__.py | 6 - .../src/seed/resources/errors/__init__.py | 6 - .../seed/resources/errors/errors/__init__.py | 5 - .../seed/resources/errors/types/__init__.py | 5 - seed/sdk/examples/snippet.json | 6 +- seed/sdk/examples/src/seed/__init__.py | 8 +- seed/sdk/examples/src/seed/client.py | 6 +- .../commons/resources => commons}/__init__.py | 0 .../types => commons}/types/__init__.py | 0 .../resources/types => commons}/types/data.py | 2 +- .../types => commons}/types/event_info.py | 2 +- .../types => commons}/types/metadata.py | 4 +- .../resources/types => commons}/types/tag.py | 0 .../file/resources => file}/__init__.py | 0 .../file/client.py => file/_client.py} | 6 +- .../src/seed/file/notification}/__init__.py | 0 .../notification/_client.py} | 6 +- .../notification}/service/__init__.py | 0 .../notification/service/_client.py} | 6 +- .../types => file/service}/__init__.py | 0 .../client.py => file/service/_client.py} | 10 +- .../types => file/service}/filename.py | 0 .../src/seed/health}/__init__.py | 0 .../client.py => health/_client.py} | 8 +- .../{resources => health}/service/__init__.py | 0 .../client.py => health/service/_client.py} | 4 +- .../examples/src/seed/resources/__init__.py | 67 --- .../src/seed/resources/commons/__init__.py | 25 - .../commons/resources/types/__init__.py | 5 - .../src/seed/resources/file/__init__.py | 5 - .../file/resources/notification/__init__.py | 5 - .../notification/resources/__init__.py | 5 - .../file/resources/service/__init__.py | 5 - .../src/seed/resources/health/__init__.py | 5 - .../resources/health/resources/__init__.py | 5 - .../src/seed/resources/types/__init__.py | 61 -- .../src/seed/service}/__init__.py | 0 .../service/client.py => service/_client.py} | 14 +- .../{resources/types => }/types/__init__.py | 2 + .../seed/{resources/types => }/types/actor.py | 2 +- .../{resources/types => }/types/actress.py | 2 +- .../types => }/types/cast_member.py | 0 .../{resources/types => }/types/directory.py | 2 +- .../{resources/types => }/types/exception.py | 0 .../types => }/types/exception_info.py | 2 +- .../types => }/types/extended_movie.py | 2 +- .../seed/{resources/types => }/types/file.py | 2 +- .../{resources/types => }/types/metadata.py | 2 +- .../{resources/types => }/types/migration.py | 2 +- .../types => }/types/migration_status.py | 0 .../{resources/types => }/types/moment.py | 2 +- .../seed/{resources/types => }/types/movie.py | 4 +- .../{resources/types => }/types/movie_id.py | 0 .../seed/{resources/types => }/types/node.py | 2 +- .../types/errors => types}/not_found_error.py | 2 +- .../{resources/types => }/types/request.py | 2 +- .../{resources/types => }/types/response.py | 2 +- .../types => }/types/stunt_double.py | 2 +- .../seed/{resources/types => }/types/test.py | 0 .../seed/{resources/types => }/types/tree.py | 2 +- .../extra_dependencies/src/seed/__init__.py | 13 +- .../extra_dependencies/src/seed/client.py | 10 +- .../resources => endpoints}/__init__.py | 0 .../src/seed/endpoints/_client.py} | 16 +- .../enum => endpoints/container}/__init__.py | 0 .../container/_client.py} | 8 +- .../enum}/__init__.py | 0 .../client.py => endpoints/enum/_client.py} | 8 +- .../http_methods}/__init__.py | 0 .../seed/endpoints/http_methods/_client.py} | 10 +- .../params => endpoints/object}/__init__.py | 0 .../src/seed/endpoints/object/_client.py} | 16 +- .../params}/__init__.py | 0 .../src/seed/endpoints/params/_client.py} | 8 +- .../union => endpoints/primitive}/__init__.py | 0 .../src/seed/endpoints/primitive/_client.py} | 6 +- .../union}/__init__.py | 0 .../src/seed/endpoints/union/_client.py} | 8 +- .../src/seed/general_errors}/__init__.py | 3 +- .../bad_object_request_info.py | 2 +- .../seed/general_errors}/bad_request_body.py | 4 +- .../no_auth => inlined_requests}/__init__.py | 0 .../src/seed/inlined_requests/_client.py} | 12 +- .../no_req_body => no_auth}/__init__.py | 0 .../src/seed/no_auth/_client.py} | 10 +- .../__init__.py | 0 .../src/seed/no_req_body/_client.py} | 6 +- .../src/seed/req_with_headers}/__init__.py | 0 .../src/seed/req_with_headers/_client.py} | 8 +- .../src/seed/resources/__init__.py | 16 - .../src/seed/resources/endpoints/__init__.py | 5 - .../seed/resources/general_errors/__init__.py | 6 - .../general_errors/errors/__init__.py | 5 - .../src/seed/resources/types/__init__.py | 47 -- .../types/resources/enum/__init__.py | 6 - .../types/resources/enum/types/__init__.py | 5 - .../types/resources/object/__init__.py | 27 - .../types/resources/object/errors/__init__.py | 13 - .../types/resources/union/__init__.py | 6 - .../types/resources/union/errors/__init__.py | 5 - .../types/resources => types}/__init__.py | 0 .../src/seed/types/enum}/__init__.py | 3 +- .../seed/types/enum}/error_with_enum_body.py | 4 +- .../types => types/enum}/weather_report.py | 0 .../src/seed/types/object}/__init__.py | 8 + .../nested_object_with_optional_field.py | 2 +- ...nested_object_with_optional_field_error.py | 4 +- .../nested_object_with_required_field.py | 2 +- ...nested_object_with_required_field_error.py | 4 +- .../types/object}/object_with_map_of_map.py | 2 +- .../object}/object_with_optional_field.py | 2 +- .../object_with_optional_field_error.py | 4 +- .../object}/object_with_required_field.py | 2 +- .../object_with_required_field_error.py | 4 +- .../src/seed/types/union}/__init__.py | 3 +- .../union/types => types/union}/animal.py | 0 .../src/seed/types/union}/cat.py | 2 +- .../union/types => types/union}/dog.py | 2 +- .../types/union}/error_with_union_body.py | 4 +- .../five-second-timeout/src/seed/__init__.py | 13 +- .../five-second-timeout/src/seed/client.py | 10 +- .../resources => endpoints}/__init__.py | 0 .../src/seed/endpoints/_client.py} | 16 +- .../enum => endpoints/container}/__init__.py | 0 .../container/_client.py} | 8 +- .../enum}/__init__.py | 0 .../client.py => endpoints/enum/_client.py} | 8 +- .../http_methods}/__init__.py | 0 .../http_methods/_client.py} | 10 +- .../params => endpoints/object}/__init__.py | 0 .../client.py => endpoints/object/_client.py} | 16 +- .../params}/__init__.py | 0 .../client.py => endpoints/params/_client.py} | 8 +- .../union => endpoints/primitive}/__init__.py | 0 .../primitive/_client.py} | 6 +- .../union}/__init__.py | 0 .../client.py => endpoints/union/_client.py} | 8 +- .../types => general_errors}/__init__.py | 3 +- .../bad_object_request_info.py | 2 +- .../seed/general_errors}/bad_request_body.py | 4 +- .../no_auth => inlined_requests}/__init__.py | 0 .../client.py => inlined_requests/_client.py} | 12 +- .../no_req_body => no_auth}/__init__.py | 0 .../no_auth/client.py => no_auth/_client.py} | 10 +- .../__init__.py | 0 .../client.py => no_req_body/_client.py} | 6 +- .../src/seed/req_with_headers}/__init__.py | 0 .../client.py => req_with_headers/_client.py} | 8 +- .../src/seed/resources/__init__.py | 16 - .../src/seed/resources/endpoints/__init__.py | 5 - .../seed/resources/general_errors/__init__.py | 6 - .../general_errors/errors/__init__.py | 5 - .../src/seed/resources/types/__init__.py | 47 -- .../types/resources/enum/__init__.py | 6 - .../types/resources/enum/types/__init__.py | 5 - .../types/resources/object/__init__.py | 27 - .../types/resources/object/errors/__init__.py | 13 - .../types/resources/union/__init__.py | 6 - .../types/resources/union/errors/__init__.py | 5 - .../types/resources => types}/__init__.py | 0 .../src/seed/types/enum}/__init__.py | 3 +- .../enum}/error_with_enum_body.py | 4 +- .../types => types/enum}/weather_report.py | 0 .../src/seed/types/object}/__init__.py | 8 + .../nested_object_with_optional_field.py | 2 +- ...nested_object_with_optional_field_error.py | 4 +- .../nested_object_with_required_field.py | 2 +- ...nested_object_with_required_field_error.py | 4 +- .../types/object}/object_with_map_of_map.py | 2 +- .../object}/object_with_optional_field.py | 2 +- .../object_with_optional_field_error.py | 4 +- .../object}/object_with_required_field.py | 2 +- .../object_with_required_field_error.py | 4 +- .../union/types => types/union}/__init__.py | 3 +- .../union/types => types/union}/animal.py | 0 .../src/seed/types/union}/cat.py | 2 +- .../src/seed/types/union}/dog.py | 2 +- .../types/union}/error_with_union_body.py | 4 +- .../infinite-timeout/src/seed/__init__.py | 13 +- .../infinite-timeout/src/seed/client.py | 10 +- .../resources => endpoints}/__init__.py | 0 .../src/seed/endpoints/_client.py} | 16 +- .../enum => endpoints/container}/__init__.py | 0 .../container/_client.py} | 8 +- .../enum}/__init__.py | 0 .../client.py => endpoints/enum/_client.py} | 8 +- .../http_methods}/__init__.py | 0 .../http_methods/_client.py} | 10 +- .../params => endpoints/object}/__init__.py | 0 .../client.py => endpoints/object/_client.py} | 16 +- .../params}/__init__.py | 0 .../client.py => endpoints/params/_client.py} | 8 +- .../union => endpoints/primitive}/__init__.py | 0 .../primitive/_client.py} | 6 +- .../union}/__init__.py | 0 .../client.py => endpoints/union/_client.py} | 8 +- .../src/seed/general_errors}/__init__.py | 3 +- .../bad_object_request_info.py | 2 +- .../bad_request_body.py | 4 +- .../no_auth => inlined_requests}/__init__.py | 0 .../client.py => inlined_requests/_client.py} | 12 +- .../no_req_body => no_auth}/__init__.py | 0 .../no_auth/client.py => no_auth/_client.py} | 10 +- .../__init__.py | 0 .../client.py => no_req_body/_client.py} | 6 +- .../src/seed/req_with_headers}/__init__.py | 0 .../client.py => req_with_headers/_client.py} | 8 +- .../src/seed/resources/__init__.py | 16 - .../src/seed/resources/endpoints/__init__.py | 5 - .../seed/resources/general_errors/__init__.py | 6 - .../general_errors/errors/__init__.py | 5 - .../src/seed/resources/types/__init__.py | 47 -- .../types/resources/enum/__init__.py | 6 - .../types/resources/enum/types/__init__.py | 5 - .../types/resources/object/__init__.py | 27 - .../types/resources/object/errors/__init__.py | 13 - .../types/resources/union/__init__.py | 6 - .../types/resources/union/errors/__init__.py | 5 - .../types/resources => types}/__init__.py | 0 .../src/seed/types/enum}/__init__.py | 3 +- .../seed/types/enum}/error_with_enum_body.py | 4 +- .../types => types/enum}/weather_report.py | 0 .../src/seed/types/object}/__init__.py | 8 + .../nested_object_with_optional_field.py | 2 +- ...nested_object_with_optional_field_error.py | 4 +- .../nested_object_with_required_field.py | 2 +- ...nested_object_with_required_field_error.py | 4 +- .../types/object}/object_with_map_of_map.py | 2 +- .../object}/object_with_optional_field.py | 2 +- .../object_with_optional_field_error.py | 4 +- .../object}/object_with_required_field.py | 2 +- .../object_with_required_field_error.py | 4 +- .../src/seed/types/union}/__init__.py | 3 +- .../union/types => types/union}/animal.py | 0 .../src/seed/types/union}/cat.py | 2 +- .../src/seed/types/union}/dog.py | 2 +- .../types/union}/error_with_union_body.py | 4 +- .../no-custom-config/src/seed/__init__.py | 13 +- .../no-custom-config/src/seed/client.py | 10 +- .../resources => endpoints}/__init__.py | 0 .../src/seed/endpoints/_client.py} | 16 +- .../enum => endpoints/container}/__init__.py | 0 .../src/seed/endpoints/container/_client.py} | 8 +- .../enum}/__init__.py | 0 .../src/seed/endpoints/enum/_client.py} | 8 +- .../http_methods}/__init__.py | 0 .../seed/endpoints/http_methods/_client.py} | 10 +- .../params => endpoints/object}/__init__.py | 0 .../client.py => endpoints/object/_client.py} | 16 +- .../params}/__init__.py | 0 .../src/seed/endpoints/params/_client.py} | 8 +- .../union => endpoints/primitive}/__init__.py | 0 .../src/seed/endpoints/primitive/_client.py} | 6 +- .../union}/__init__.py | 0 .../src/seed/endpoints/union/_client.py} | 8 +- .../types => general_errors}/__init__.py | 3 +- .../bad_object_request_info.py | 2 +- .../bad_request_body.py | 4 +- .../no_auth => inlined_requests}/__init__.py | 0 .../src/seed/inlined_requests/_client.py} | 12 +- .../no_req_body => no_auth}/__init__.py | 0 .../src/seed/no_auth/_client.py} | 10 +- .../__init__.py | 0 .../src/seed/no_req_body/_client.py} | 6 +- .../src/seed/req_with_headers}/__init__.py | 0 .../client.py => req_with_headers/_client.py} | 8 +- .../src/seed/resources/__init__.py | 16 - .../src/seed/resources/endpoints/__init__.py | 5 - .../seed/resources/general_errors/__init__.py | 6 - .../general_errors/errors/__init__.py | 5 - .../src/seed/resources/types/__init__.py | 47 -- .../types/resources/enum/__init__.py | 6 - .../types/resources/enum/types/__init__.py | 5 - .../types/resources/object/__init__.py | 27 - .../types/resources/object/errors/__init__.py | 13 - .../types/resources/union/__init__.py | 6 - .../types/resources/union/errors/__init__.py | 5 - .../types/resources => types}/__init__.py | 0 .../enum/errors => types/enum}/__init__.py | 3 +- .../enum}/error_with_enum_body.py | 4 +- .../types => types/enum}/weather_report.py | 0 .../src/seed/types/object}/__init__.py | 8 + .../nested_object_with_optional_field.py | 2 +- ...nested_object_with_optional_field_error.py | 4 +- .../nested_object_with_required_field.py | 2 +- ...nested_object_with_required_field_error.py | 4 +- .../types/object}/object_with_map_of_map.py | 2 +- .../object}/object_with_optional_field.py | 2 +- .../object_with_optional_field_error.py | 4 +- .../object}/object_with_required_field.py | 2 +- .../object_with_required_field_error.py | 4 +- .../union/types => types/union}/__init__.py | 3 +- .../union/types => types/union}/animal.py | 0 .../src/seed/types/union}/cat.py | 2 +- .../src/seed/types/union}/dog.py | 2 +- .../types/union}/error_with_union_body.py | 4 +- .../pydantic-v1/src/seed/__init__.py | 13 +- .../exhaustive/pydantic-v1/src/seed/client.py | 10 +- .../resources => endpoints}/__init__.py | 0 .../pydantic-v1/src/seed/endpoints/_client.py | 34 ++ .../enum => endpoints/container}/__init__.py | 0 .../src/seed/endpoints/container/_client.py} | 8 +- .../enum}/__init__.py | 0 .../src/seed/endpoints/enum/_client.py} | 8 +- .../http_methods}/__init__.py | 0 .../seed/endpoints/http_methods/_client.py} | 10 +- .../params => endpoints/object}/__init__.py | 0 .../src/seed/endpoints/object/_client.py} | 16 +- .../params}/__init__.py | 0 .../client.py => endpoints/params/_client.py} | 8 +- .../union => endpoints/primitive}/__init__.py | 0 .../primitive/_client.py} | 6 +- .../union}/__init__.py | 0 .../src/seed/endpoints/union/_client.py} | 8 +- .../src/seed/general_errors/__init__.py | 6 + .../bad_object_request_info.py | 2 +- .../seed/general_errors/bad_request_body.py | 9 + .../no_auth => inlined_requests}/__init__.py | 0 .../src/seed/inlined_requests/_client.py} | 12 +- .../no_req_body => no_auth}/__init__.py | 0 .../no_auth/client.py => no_auth/_client.py} | 10 +- .../__init__.py | 0 .../src/seed/no_req_body/_client.py} | 6 +- .../src/seed/req_with_headers}/__init__.py | 0 .../src/seed/req_with_headers/_client.py} | 8 +- .../src/seed/resources/__init__.py | 16 - .../src/seed/resources/endpoints/__init__.py | 5 - .../src/seed/resources/endpoints/client.py | 34 -- .../seed/resources/general_errors/__init__.py | 6 - .../general_errors/errors/__init__.py | 5 - .../general_errors/errors/bad_request_body.py | 9 - .../general_errors/types/__init__.py | 5 - .../src/seed/resources/types/__init__.py | 47 -- .../types/resources/enum/__init__.py | 6 - .../types/resources/enum/errors/__init__.py | 5 - .../enum/errors/error_with_enum_body.py | 9 - .../types/resources/enum/types/__init__.py | 5 - .../types/resources/object/__init__.py | 27 - .../types/resources/object/errors/__init__.py | 13 - ...nested_object_with_optional_field_error.py | 9 - ...nested_object_with_required_field_error.py | 9 - .../object_with_optional_field_error.py | 9 - .../object_with_required_field_error.py | 9 - .../types/resources/object/types/__init__.py | 15 - .../types/resources/union/__init__.py | 6 - .../types/resources/union/errors/__init__.py | 5 - .../union/errors/error_with_union_body.py | 9 - .../types/resources/union/types/__init__.py | 7 - .../types/resources => types}/__init__.py | 0 .../src/seed/types/enum/__init__.py | 6 + .../seed/types/enum/error_with_enum_body.py | 9 + .../types => types/enum}/weather_report.py | 0 .../src/seed/types/object/__init__.py | 23 + .../nested_object_with_optional_field.py | 2 +- ...nested_object_with_optional_field_error.py | 9 + .../nested_object_with_required_field.py | 2 +- ...nested_object_with_required_field_error.py | 9 + .../object}/object_with_map_of_map.py | 2 +- .../object}/object_with_optional_field.py | 2 +- .../object_with_optional_field_error.py | 9 + .../object}/object_with_required_field.py | 2 +- .../object_with_required_field_error.py | 9 + .../src/seed/types/union/__init__.py | 8 + .../union/types => types/union}/animal.py | 0 .../union/types => types/union}/cat.py | 2 +- .../union/types => types/union}/dog.py | 2 +- .../seed/types/union/error_with_union_body.py | 9 + .../union-utils/src/seed/__init__.py | 13 +- .../exhaustive/union-utils/src/seed/client.py | 10 +- .../resources => endpoints}/__init__.py | 0 .../union-utils/src/seed/endpoints/_client.py | 34 ++ .../enum => endpoints/container}/__init__.py | 0 .../src/seed/endpoints/container/_client.py} | 8 +- .../enum}/__init__.py | 0 .../src/seed/endpoints/enum/_client.py} | 8 +- .../http_methods}/__init__.py | 0 .../seed/endpoints/http_methods/_client.py} | 10 +- .../params => endpoints/object}/__init__.py | 0 .../src/seed/endpoints/object/_client.py} | 16 +- .../params}/__init__.py | 0 .../src/seed/endpoints/params/_client.py} | 8 +- .../union => endpoints/primitive}/__init__.py | 0 .../src/seed/endpoints/primitive/_client.py} | 6 +- .../union}/__init__.py | 0 .../src/seed/endpoints/union/_client.py} | 8 +- .../src/seed/general_errors/__init__.py | 6 + .../general_errors/bad_object_request_info.py | 28 + .../seed/general_errors/bad_request_body.py | 9 + .../no_auth => inlined_requests}/__init__.py | 0 .../client.py => inlined_requests/_client.py} | 12 +- .../no_req_body => no_auth}/__init__.py | 0 .../src/seed/no_auth/_client.py} | 10 +- .../__init__.py | 0 .../src/seed/no_req_body/_client.py} | 6 +- .../src/seed/req_with_headers}/__init__.py | 0 .../src/seed/req_with_headers/_client.py} | 8 +- .../src/seed/resources/__init__.py | 16 - .../src/seed/resources/endpoints/__init__.py | 5 - .../src/seed/resources/endpoints/client.py | 34 -- .../seed/resources/general_errors/__init__.py | 6 - .../general_errors/errors/__init__.py | 5 - .../general_errors/errors/bad_request_body.py | 9 - .../general_errors/types/__init__.py | 5 - .../types/bad_object_request_info.py | 28 - .../src/seed/resources/types/__init__.py | 43 -- .../types/resources/enum/__init__.py | 6 - .../types/resources/enum/errors/__init__.py | 5 - .../enum/errors/error_with_enum_body.py | 9 - .../types/resources/enum/types/__init__.py | 5 - .../types/resources/object/__init__.py | 27 - .../types/resources/object/errors/__init__.py | 13 - ...nested_object_with_optional_field_error.py | 9 - ...nested_object_with_required_field_error.py | 9 - .../object_with_optional_field_error.py | 9 - .../object_with_required_field_error.py | 9 - .../types/resources/object/types/__init__.py | 15 - .../nested_object_with_optional_field.py | 31 -- .../nested_object_with_required_field.py | 31 -- .../object/types/object_with_map_of_map.py | 28 - .../types/object_with_optional_field.py | 41 -- .../types/object_with_required_field.py | 28 - .../types/resources/union/__init__.py | 6 - .../types/resources/union/errors/__init__.py | 5 - .../union/errors/error_with_union_body.py | 9 - .../types/resources/union/types/cat.py | 30 - .../types/resources/union/types/dog.py | 30 - .../types/resources => types}/__init__.py | 0 .../src/seed/types/enum/__init__.py | 6 + .../seed/types/enum/error_with_enum_body.py | 9 + .../types => types/enum}/weather_report.py | 0 .../src/seed/types/object/__init__.py | 23 + .../nested_object_with_optional_field.py | 31 ++ ...nested_object_with_optional_field_error.py | 9 + .../nested_object_with_required_field.py | 31 ++ ...nested_object_with_required_field_error.py | 9 + .../types/object/object_with_map_of_map.py | 28 + .../object/object_with_optional_field.py | 41 ++ .../object_with_optional_field_error.py | 9 + .../object/object_with_required_field.py | 28 + .../object_with_required_field_error.py | 9 + .../union/types => types/union}/__init__.py | 3 +- .../union/types => types/union}/animal.py | 30 +- .../union-utils/src/seed/types/union/cat.py | 30 + .../union-utils/src/seed/types/union/dog.py | 30 + .../seed/types/union/error_with_union_body.py | 9 + seed/sdk/extends/src/seed/__init__.py | 5 +- seed/sdk/extends/src/seed/{types => }/docs.py | 2 +- .../src/seed/{types => }/example_type.py | 2 +- seed/sdk/extends/src/seed/{types => }/json.py | 2 +- .../src/seed/{types => }/nested_type.py | 2 +- seed/sdk/extends/src/seed/types/__init__.py | 8 - seed/sdk/file-download/src/seed/__init__.py | 2 +- seed/sdk/file-download/src/seed/client.py | 2 +- .../src/seed/resources/__init__.py | 5 - .../src/seed/service}/__init__.py | 0 .../service/client.py => service/_client.py} | 4 +- seed/sdk/file-upload/src/seed/__init__.py | 3 +- seed/sdk/file-upload/src/seed/client.py | 2 +- .../src/seed/resources/__init__.py | 6 - .../src/seed/resources/service/__init__.py | 5 - .../service/types => service}/__init__.py | 0 .../service/client.py => service/_client.py} | 12 +- .../service/types => service}/maybe_list.py | 0 .../types => service}/maybe_list_or_set.py | 0 .../service/types => service}/my_object.py | 2 +- seed/sdk/folders/src/seed/__init__.py | 2 +- .../{resources/a/resources => a}/__init__.py | 0 .../{resources/a/client.py => a/_client.py} | 6 +- .../a/resources/c => a/b}/__init__.py | 0 .../resources/b/client.py => a/b/_client.py} | 4 +- .../src/seed/a/c}/__init__.py | 0 .../resources/c/client.py => a/c/_client.py} | 4 +- .../resources/d/resources => a/d}/__init__.py | 0 .../resources/types => a/d}/types/__init__.py | 0 .../d/resources/types => a/d}/types/foo.py | 0 seed/sdk/folders/src/seed/client.py | 4 +- .../folder/resources => folder}/__init__.py | 0 .../folder/client.py => folder/_client.py} | 6 +- .../src/seed/folder/service}/__init__.py | 0 .../client.py => folder/service/_client.py} | 8 +- .../service}/not_found_error.py | 2 +- .../folders/src/seed/resources/__init__.py | 5 - .../folders/src/seed/resources/a/__init__.py | 5 - .../seed/resources/a/resources/d/__init__.py | 5 - .../a/resources/d/resources/types/__init__.py | 5 - .../src/seed/resources/folder/__init__.py | 5 - .../folder/resources/service/__init__.py | 5 - .../resources/service/errors/__init__.py | 5 - .../idempotency-headers/src/seed/__init__.py | 3 +- .../idempotency-headers/src/seed/client.py | 2 +- .../payment/types => payment}/__init__.py | 0 .../payment/client.py => payment/_client.py} | 10 +- .../payment/types => payment}/currency.py | 0 .../src/seed/resources/__init__.py | 6 - .../src/seed/resources/payment/__init__.py | 5 - seed/sdk/imdb/src/seed/__init__.py | 3 +- seed/sdk/imdb/src/seed/client.py | 2 +- .../imdb/types => imdb}/__init__.py | 3 +- .../imdb/client.py => imdb/_client.py} | 14 +- .../types => imdb}/create_movie_request.py | 2 +- .../{resources/imdb/types => imdb}/movie.py | 2 +- .../movie_does_not_exist_error.py | 4 +- .../imdb/types => imdb}/movie_id.py | 0 seed/sdk/imdb/src/seed/resources/__init__.py | 6 - .../imdb/src/seed/resources/imdb/__init__.py | 6 - .../seed/resources/imdb/errors/__init__.py | 5 - seed/sdk/literal-headers/src/seed/__init__.py | 2 +- seed/sdk/literal-headers/src/seed/client.py | 6 +- .../__init__.py | 0 .../client.py => no_headers/_client.py} | 4 +- .../__init__.py | 0 .../_client.py} | 6 +- .../src/seed/resources/__init__.py | 5 - .../with_non_literal_headers}/__init__.py | 0 .../_client.py} | 6 +- seed/sdk/literal/src/seed/__init__.py | 4 +- seed/sdk/literal/src/seed/client.py | 2 +- .../literal/types => literal}/__init__.py | 0 .../literal/client.py => literal/_client.py} | 12 +- .../create_options_response.py | 0 .../literal/types => literal}/options.py | 2 +- .../undiscriminated_options.py | 0 .../literal/src/seed/resources/__init__.py | 19 - .../src/seed/resources/literal/__init__.py | 17 - .../src/seed/__init__.py | 2 +- .../multi-url-environment/src/seed/client.py | 4 +- .../seed/{resources/s_3 => ec_2}/__init__.py | 0 .../ec_2/client.py => ec_2/_client.py} | 6 +- .../src/seed/resources/__init__.py | 5 - .../src/seed/s_3}/__init__.py | 0 .../s_3/client.py => s_3/_client.py} | 6 +- seed/sdk/no-environment/src/seed/__init__.py | 2 +- seed/sdk/no-environment/src/seed/client.py | 2 +- .../src/seed/dummy}/__init__.py | 0 .../src/seed/dummy/_client.py} | 4 +- seed/sdk/object/src/seed/__init__.py | 3 +- seed/sdk/object/src/seed/{types => }/name.py | 2 +- seed/sdk/object/src/seed/{types => }/type.py | 2 +- seed/sdk/object/src/seed/types/__init__.py | 6 - seed/sdk/objects-with-imports/snippet.json | 8 +- .../objects-with-imports/src/seed/__init__.py | 6 +- .../commons/resources => commons}/__init__.py | 0 .../types => commons/metadata}/__init__.py | 0 .../types => commons/metadata}/metadata.py | 4 +- .../src/seed/file}/__init__.py | 4 +- .../types => file/directory}/__init__.py | 0 .../types => file/directory}/directory.py | 6 +- .../{resources/file/types => file}/file.py | 2 +- .../file/types => file}/file_info.py | 0 .../src/seed/{types => }/node.py | 6 +- .../src/seed/resources/__init__.py | 6 - .../src/seed/resources/commons/__init__.py | 5 - .../commons/resources/metadata/__init__.py | 5 - .../src/seed/resources/file/__init__.py | 6 - .../seed/resources/file/resources/__init__.py | 6 - .../file/resources/directory/__init__.py | 5 - .../src/seed/resources/file/types/__init__.py | 6 - .../src/seed/{types => }/tree.py | 4 +- .../src/seed/types/__init__.py | 6 - seed/sdk/optional/.github/workflows/ci.yml | 36 ++ seed/sdk/optional/.gitignore | 4 + seed/sdk/optional/README.md | 0 seed/sdk/optional/poetry.lock | 519 ++++++++++++++++++ seed/sdk/optional/pyproject.toml | 22 + seed/sdk/optional/snippet.json | 0 .../common => optional/src/seed}/__init__.py | 4 +- seed/sdk/optional/src/seed/client.py | 32 ++ seed/sdk/optional/src/seed/core/__init__.py | 17 + seed/sdk/optional/src/seed/core/api_error.py | 15 + .../optional/src/seed/core/client_wrapper.py | 33 ++ .../optional/src/seed/core/datetime_utils.py | 28 + .../src/seed/core/jsonable_encoder.py | 103 ++++ .../src/seed/core/remove_none_from_dict.py | 11 + .../src/seed/optional}/__init__.py | 0 .../sdk/optional/src/seed/optional/_client.py | 67 +++ seed/sdk/optional/src/seed/py.typed | 0 seed/sdk/optional/tests/__init__.py | 0 seed/sdk/optional/tests/test_client.py | 6 + seed/sdk/package-yml/src/seed/__init__.py | 2 +- seed/sdk/package-yml/src/seed/client.py | 2 +- .../src/seed/resources/__init__.py | 5 - .../src/seed/service}/__init__.py | 0 .../service/client.py => service/_client.py} | 4 +- seed/sdk/plain-text/src/seed/__init__.py | 2 +- seed/sdk/plain-text/src/seed/client.py | 2 +- .../plain-text/src/seed/resources/__init__.py | 5 - .../src/seed/service}/__init__.py | 0 .../service/client.py => service/_client.py} | 4 +- .../reserved-keywords/src/seed/__init__.py | 3 +- seed/sdk/reserved-keywords/src/seed/client.py | 2 +- .../package/types => package}/__init__.py | 0 .../package/client.py => package/_client.py} | 6 +- .../package/types => package}/package.py | 2 +- .../package/types => package}/record.py | 2 +- .../src/seed/resources/__init__.py | 6 - .../src/seed/resources/package/__init__.py | 5 - seed/sdk/seed.yml | 3 + .../src/seed/__init__.py | 2 +- .../src/seed/client.py | 2 +- .../src/seed/dummy}/__init__.py | 0 .../src/seed/dummy/_client.py} | 4 +- .../src/seed/resources/__init__.py | 5 - .../src/seed/__init__.py | 2 +- .../src/seed/client.py | 2 +- .../src/seed/dummy}/__init__.py | 0 .../src/seed/dummy/_client.py} | 4 +- .../src/seed/resources/__init__.py | 5 - seed/sdk/streaming/src/seed/__init__.py | 3 +- seed/sdk/streaming/src/seed/client.py | 2 +- .../dummy/types => dummy}/__init__.py | 0 .../dummy/client.py => dummy/_client.py} | 8 +- .../dummy/types => dummy}/stream_response.py | 2 +- .../streaming/src/seed/resources/__init__.py | 6 - .../src/seed/resources/dummy/__init__.py | 5 - seed/sdk/trace/src/seed/__init__.py | 197 ++++--- .../admin/types => admin}/__init__.py | 0 .../admin/client.py => admin/_client.py} | 26 +- .../{resources/admin/types => admin}/test.py | 0 seed/sdk/trace/src/seed/client.py | 16 +- .../commons/types => commons}/__init__.py | 0 .../binary_tree_node_and_tree_value.py | 2 +- .../binary_tree_node_value.py | 2 +- .../types => commons}/binary_tree_value.py | 2 +- .../debug_key_value_pairs.py | 2 +- .../types => commons}/debug_map_value.py | 2 +- .../types => commons}/debug_variable_value.py | 0 .../doubly_linked_list_node_and_list_value.py | 2 +- .../doubly_linked_list_node_value.py | 2 +- .../doubly_linked_list_value.py | 2 +- .../commons/types => commons}/file_info.py | 2 +- .../types => commons}/generic_value.py | 2 +- .../types => commons}/key_value_pair.py | 2 +- .../commons/types => commons}/language.py | 0 .../commons/types => commons}/list_type.py | 2 +- .../commons/types => commons}/map_type.py | 2 +- .../commons/types => commons}/map_value.py | 2 +- .../commons/types => commons}/node_id.py | 0 .../commons/types => commons}/problem_id.py | 0 .../singly_linked_list_node_and_list_value.py | 2 +- .../singly_linked_list_node_value.py | 2 +- .../singly_linked_list_value.py | 2 +- .../commons/types => commons}/test_case.py | 2 +- .../test_case_with_expected_result.py | 2 +- .../commons/types => commons}/user_id.py | 0 .../types => commons}/variable_type.py | 0 .../types => commons}/variable_value.py | 0 .../src/seed/homepage}/__init__.py | 0 .../client.py => homepage/_client.py} | 8 +- .../types => lang_server}/__init__.py | 0 .../lang_server_request.py | 2 +- .../lang_server_response.py | 2 +- .../migration/types => migration}/__init__.py | 0 .../client.py => migration/_client.py} | 8 +- .../types => migration}/migration.py | 2 +- .../types => migration}/migration_status.py | 0 .../playlist/types => playlist}/__init__.py | 4 + .../client.py => playlist/_client.py} | 26 +- .../playlist/types => playlist}/playlist.py | 4 +- .../playlist_create_request.py | 4 +- .../types => playlist}/playlist_id.py | 0 .../playlist_id_not_found_error.py | 4 +- .../playlist_id_not_found_error_body.py | 0 .../reserved_keyword_enum.py | 0 .../errors => playlist}/unauthorized_error.py | 2 +- .../update_playlist_request.py | 4 +- .../problem/types => problem}/__init__.py | 0 .../problem/client.py => problem/_client.py} | 20 +- .../types => problem}/create_problem_error.py | 0 .../create_problem_request.py | 8 +- .../create_problem_response.py | 2 +- .../generic_create_problem_error.py | 2 +- .../get_default_starter_files_response.py | 4 +- .../types => problem}/problem_description.py | 2 +- .../problem_description_board.py | 2 +- .../types => problem}/problem_files.py | 4 +- .../problem/types => problem}/problem_info.py | 10 +- .../update_problem_response.py | 2 +- .../variable_type_and_name.py | 4 +- seed/sdk/trace/src/seed/resources/__init__.py | 494 ----------------- .../src/seed/resources/admin/__init__.py | 5 - .../src/seed/resources/commons/__init__.py | 127 ----- .../seed/resources/lang_server/__init__.py | 5 - .../src/seed/resources/migration/__init__.py | 5 - .../src/seed/resources/playlist/__init__.py | 24 - .../resources/playlist/errors/__init__.py | 6 - .../src/seed/resources/problem/__init__.py | 41 -- .../src/seed/resources/submission/__init__.py | 295 ---------- .../trace/src/seed/resources/v_2/__init__.py | 119 ---- .../v_2/resources/problem/__init__.py | 115 ---- .../resources/v_2/resources/v_3/__init__.py | 117 ---- .../v_3/resources/problem/__init__.py | 115 ---- .../types => submission}/__init__.py | 0 .../client.py => submission/_client.py} | 10 +- .../types => submission}/actual_result.py | 2 +- .../building_executor_response.py | 2 +- .../code_execution_update.py | 0 .../types => submission}/compile_error.py | 2 +- .../custom_test_cases_unsupported.py | 4 +- .../types => submission}/error_info.py | 0 .../types => submission}/errored_response.py | 2 +- .../types => submission}/exception_info.py | 2 +- .../types => submission}/exception_v_2.py | 0 .../execution_session_response.py | 4 +- .../execution_session_state.py | 6 +- .../execution_session_status.py | 0 .../existing_submission_executing.py | 2 +- .../expression_location.py | 2 +- .../types => submission}/finished_response.py | 2 +- .../get_execution_session_state_response.py | 2 +- .../get_submission_state_response.py | 4 +- .../get_trace_responses_page_request.py | 2 +- .../types => submission}/graded_response.py | 2 +- .../graded_response_v_2.py | 4 +- .../graded_test_case_update.py | 4 +- .../initialize_problem_request.py | 4 +- .../types => submission}/internal_error.py | 2 +- .../invalid_request_cause.py | 0 .../invalid_request_response.py | 2 +- .../lightweight_stackframe_information.py | 2 +- .../recorded_response_notification.py | 2 +- .../recorded_test_case_update.py | 4 +- .../recording_response_notification.py | 2 +- .../types => submission}/running_response.py | 2 +- .../running_submission_state.py | 0 .../types => submission}/runtime_error.py | 2 +- .../submission/types => submission}/scope.py | 4 +- .../types => submission}/share_id.py | 0 .../types => submission}/stack_frame.py | 2 +- .../types => submission}/stack_information.py | 2 +- .../types => submission}/stderr_response.py | 2 +- .../types => submission}/stdout_response.py | 2 +- .../types => submission}/stop_request.py | 2 +- .../types => submission}/stopped_response.py | 2 +- .../submission_file_info.py | 2 +- .../types => submission}/submission_id.py | 0 .../submission_id_not_found.py | 2 +- .../submission_request.py | 0 .../submission_response.py | 2 +- .../submission_status_for_test_case.py | 0 .../submission_status_v_2.py | 0 .../submission_type_enum.py | 0 .../submission_type_state.py | 0 .../submit_request_v_2.py | 6 +- .../terminated_response.py | 2 +- .../types => submission}/test_case_grade.py | 0 .../test_case_hidden_grade.py | 2 +- .../test_case_non_hidden_grade.py | 4 +- .../types => submission}/test_case_result.py | 4 +- .../test_case_result_with_stdout.py | 2 +- .../test_submission_state.py | 6 +- .../test_submission_status.py | 20 +- .../test_submission_status_v_2.py | 6 +- .../test_submission_update.py | 2 +- .../test_submission_update_info.py | 0 .../types => submission}/trace_response.py | 4 +- .../trace_response_v_2.py | 4 +- .../trace_responses_page.py | 2 +- .../trace_responses_page_v_2.py | 2 +- .../types => submission}/traced_file.py | 2 +- .../types => submission}/traced_test_case.py | 2 +- .../unexpected_language_error.py | 4 +- .../types => submission}/workspace_files.py | 4 +- .../workspace_ran_response.py | 2 +- .../workspace_run_details.py | 2 +- .../workspace_starter_files_response.py | 4 +- .../workspace_starter_files_response_v_2.py | 6 +- .../workspace_submission_state.py | 2 +- .../workspace_submission_status.py | 0 .../workspace_submission_status_v_2.py | 2 +- .../workspace_submission_update.py | 2 +- .../workspace_submission_update_info.py | 0 .../workspace_submit_request.py | 4 +- .../workspace_traced_update.py | 2 +- .../a => trace/src/seed/sysprop}/__init__.py | 3 - .../sysprop/client.py => sysprop/_client.py} | 6 +- .../v_2/resources => v_2}/__init__.py | 0 .../v_2/client.py => v_2/_client.py} | 8 +- .../problem/types => v_2/problem}/__init__.py | 0 .../client.py => v_2/problem/_client.py} | 10 +- .../problem}/assert_correctness_check.py | 0 .../problem}/basic_custom_files.py | 4 +- .../problem}/basic_test_case_template.py | 2 +- .../problem}/create_problem_request_v_2.py | 6 +- .../types => v_2/problem}/custom_files.py | 2 +- .../deep_equality_correctness_check.py | 2 +- .../problem}/default_provided_file.py | 4 +- .../types => v_2/problem}/file_info_v_2.py | 2 +- .../problem/types => v_2/problem}/files.py | 2 +- .../problem}/function_implementation.py | 2 +- ...n_implementation_for_multiple_languages.py | 4 +- .../problem}/function_signature.py | 0 .../types => v_2/problem}/generated_files.py | 4 +- .../get_basic_solution_file_request.py | 2 +- .../get_basic_solution_file_response.py | 4 +- .../get_function_signature_request.py | 2 +- .../get_function_signature_response.py | 4 +- .../get_generated_test_case_file_request.py | 2 +- ...nerated_test_case_template_file_request.py | 2 +- .../problem}/lightweight_problem_info_v_2.py | 6 +- .../problem}/non_void_function_definition.py | 2 +- .../problem}/non_void_function_signature.py | 4 +- .../types => v_2/problem}/parameter.py | 4 +- .../types => v_2/problem}/parameter_id.py | 0 .../types => v_2/problem}/problem_info_v_2.py | 8 +- .../problem}/test_case_expects.py | 2 +- .../problem}/test_case_function.py | 0 .../types => v_2/problem}/test_case_id.py | 0 .../problem}/test_case_implementation.py | 2 +- .../test_case_implementation_description.py | 2 +- ...t_case_implementation_description_board.py | 0 .../test_case_implementation_reference.py | 0 .../problem}/test_case_metadata.py | 2 +- .../problem}/test_case_template.py | 2 +- .../problem}/test_case_template_id.py | 0 .../types => v_2/problem}/test_case_v_2.py | 4 +- ..._case_with_actual_result_implementation.py | 2 +- .../problem}/void_function_definition.py | 2 +- ...ion_definition_that_takes_actual_result.py | 2 +- .../problem}/void_function_signature.py | 2 +- ...tion_signature_that_takes_actual_result.py | 4 +- .../v_3/resources => v_2/v_3}/__init__.py | 0 .../v_3/client.py => v_2/v_3/_client.py} | 4 +- .../types => v_2/v_3/problem}/__init__.py | 0 .../client.py => v_2/v_3/problem/_client.py} | 10 +- .../v_3/problem}/assert_correctness_check.py | 0 .../v_3/problem}/basic_custom_files.py | 4 +- .../v_3/problem}/basic_test_case_template.py | 2 +- .../problem}/create_problem_request_v_2.py | 6 +- .../types => v_2/v_3/problem}/custom_files.py | 2 +- .../deep_equality_correctness_check.py | 2 +- .../v_3/problem}/default_provided_file.py | 4 +- .../v_3/problem}/file_info_v_2.py | 2 +- .../types => v_2/v_3/problem}/files.py | 2 +- .../v_3/problem}/function_implementation.py | 2 +- ...n_implementation_for_multiple_languages.py | 4 +- .../v_3/problem}/function_signature.py | 0 .../v_3/problem}/generated_files.py | 4 +- .../get_basic_solution_file_request.py | 2 +- .../get_basic_solution_file_response.py | 4 +- .../get_function_signature_request.py | 2 +- .../get_function_signature_response.py | 4 +- .../get_generated_test_case_file_request.py | 2 +- ...nerated_test_case_template_file_request.py | 2 +- .../problem}/lightweight_problem_info_v_2.py | 6 +- .../problem}/non_void_function_definition.py | 2 +- .../problem}/non_void_function_signature.py | 4 +- .../types => v_2/v_3/problem}/parameter.py | 4 +- .../types => v_2/v_3/problem}/parameter_id.py | 0 .../v_3/problem}/problem_info_v_2.py | 8 +- .../v_3/problem}/test_case_expects.py | 2 +- .../v_3/problem}/test_case_function.py | 0 .../types => v_2/v_3/problem}/test_case_id.py | 0 .../v_3/problem}/test_case_implementation.py | 2 +- .../test_case_implementation_description.py | 2 +- ...t_case_implementation_description_board.py | 0 .../test_case_implementation_reference.py | 0 .../v_3/problem}/test_case_metadata.py | 2 +- .../v_3/problem}/test_case_template.py | 2 +- .../v_3/problem}/test_case_template_id.py | 0 .../v_3/problem}/test_case_v_2.py | 4 +- ..._case_with_actual_result_implementation.py | 2 +- .../v_3/problem}/void_function_definition.py | 2 +- ...ion_definition_that_takes_actual_result.py | 2 +- .../v_3/problem}/void_function_signature.py | 2 +- ...tion_signature_that_takes_actual_result.py | 4 +- .../src/seed/__init__.py | 3 +- .../undiscriminated-unions/src/seed/client.py | 2 +- .../src/seed/resources/__init__.py | 6 - .../src/seed/resources/union/__init__.py | 5 - .../union/types => union}/__init__.py | 0 .../union/client.py => union/_client.py} | 8 +- .../union/types => union}/my_union.py | 0 seed/sdk/unknown/src/seed/__init__.py | 3 +- seed/sdk/unknown/src/seed/client.py | 2 +- .../unknown/src/seed/resources/__init__.py | 6 - .../src/seed/resources/unknown/__init__.py | 5 - .../unknown/types => unknown}/__init__.py | 0 .../unknown/client.py => unknown/_client.py} | 6 +- .../unknown/types => unknown}/my_alias.py | 0 .../unknown/types => unknown}/my_object.py | 2 +- seed/sdk/variables/src/seed/__init__.py | 2 +- seed/sdk/variables/src/seed/client.py | 2 +- .../variables/src/seed/resources/__init__.py | 5 - .../src/seed/service}/__init__.py | 3 - .../service/client.py => service/_client.py} | 4 +- .../fastapi_declaration_referencer.py | 4 - .../error_declaration_referencer.py | 8 +- .../sdk_declaration_referencer.py | 4 - ...age_async_client_declaration_referencer.py | 2 +- ...ubpackage_client_declaration_referencer.py | 2 +- .../type_declaration_referencer.py | 8 +- src/fern_python/snippet/snippet_writer.py | 4 - 1847 files changed, 4608 insertions(+), 6826 deletions(-) rename seed/fastapi/api-wide-base-path/{resources => }/service/__init__.py (100%) rename seed/fastapi/api-wide-base-path/{resources => }/service/service/__init__.py (100%) rename seed/fastapi/api-wide-base-path/{resources => }/service/service/service.py (93%) rename seed/fastapi/audiences/{resources => }/commons/__init__.py (100%) rename seed/fastapi/audiences/{resources => }/commons/types/__init__.py (100%) rename seed/fastapi/audiences/{resources => }/commons/types/imported.py (94%) rename seed/fastapi/audiences/{resources/folder_a/resources => folder_a}/__init__.py (100%) rename seed/fastapi/audiences/{resources/folder_a/resources => folder_a}/service/__init__.py (100%) rename seed/fastapi/audiences/{resources/folder_a/resources => folder_a}/service/service/__init__.py (100%) rename seed/fastapi/audiences/{resources/folder_a/resources => folder_a}/service/service/service.py (93%) rename seed/fastapi/audiences/{resources/folder_a/resources => folder_a}/service/types/__init__.py (100%) create mode 100644 seed/fastapi/audiences/folder_a/service/types/response.py rename seed/fastapi/audiences/{resources/folder_b/resources => folder_b}/__init__.py (100%) rename seed/fastapi/audiences/{resources/folder_b/resources => folder_b}/common/__init__.py (100%) rename seed/fastapi/audiences/{resources/folder_b/resources => folder_b}/common/types/__init__.py (100%) create mode 100644 seed/fastapi/audiences/folder_b/common/types/foo.py rename seed/fastapi/audiences/{resources/folder_c/resources => folder_c}/__init__.py (100%) rename seed/fastapi/audiences/{resources/folder_c/resources => folder_c}/common/__init__.py (100%) rename seed/fastapi/audiences/{resources/folder_c/resources => folder_c}/common/types/__init__.py (100%) rename seed/fastapi/audiences/{resources/folder_c/resources => folder_c}/common/types/foo.py (93%) rename seed/fastapi/audiences/{resources => }/foo/__init__.py (100%) rename seed/fastapi/audiences/{resources => }/foo/service/__init__.py (100%) rename seed/fastapi/audiences/{resources => }/foo/service/service.py (93%) rename seed/fastapi/audiences/{resources => }/foo/types/__init__.py (100%) rename seed/fastapi/audiences/{resources => }/foo/types/importing_type.py (94%) rename seed/fastapi/audiences/{resources => }/foo/types/optional_string.py (95%) delete mode 100644 seed/fastapi/audiences/resources/__init__.py delete mode 100644 seed/fastapi/audiences/resources/folder_a/__init__.py delete mode 100644 seed/fastapi/audiences/resources/folder_a/resources/service/types/response.py delete mode 100644 seed/fastapi/audiences/resources/folder_b/__init__.py delete mode 100644 seed/fastapi/audiences/resources/folder_b/resources/common/types/foo.py delete mode 100644 seed/fastapi/audiences/resources/folder_c/__init__.py rename seed/fastapi/auth-environment-variables/{resources => }/service/__init__.py (100%) rename seed/fastapi/auth-environment-variables/{resources => }/service/service/__init__.py (100%) rename seed/fastapi/auth-environment-variables/{resources => }/service/service/service.py (92%) rename seed/fastapi/basic-auth/{resources => }/basic_auth/__init__.py (100%) rename seed/fastapi/basic-auth/{resources => }/basic_auth/service/__init__.py (100%) rename seed/fastapi/basic-auth/{resources => }/basic_auth/service/service.py (95%) rename seed/fastapi/basic-auth/{resources => }/errors/__init__.py (100%) rename seed/fastapi/basic-auth/{resources => }/errors/errors/__init__.py (100%) rename seed/fastapi/{custom-auth/resources => basic-auth}/errors/errors/bad_request.py (73%) rename seed/fastapi/{custom-auth/resources => basic-auth}/errors/errors/unauthorized_request.py (82%) rename seed/fastapi/basic-auth/{resources => }/errors/types/__init__.py (100%) rename seed/fastapi/{custom-auth/resources => basic-auth}/errors/types/unauthorized_request_error_body.py (93%) delete mode 100644 seed/fastapi/basic-auth/resources/__init__.py rename seed/fastapi/bearer-token-environment-variable/{resources => }/service/__init__.py (100%) rename seed/fastapi/bearer-token-environment-variable/{resources => }/service/service/__init__.py (100%) rename seed/fastapi/bearer-token-environment-variable/{resources => }/service/service/service.py (92%) rename seed/fastapi/circular-references/{resources => }/a/__init__.py (100%) rename seed/fastapi/circular-references/{resources => }/a/types/__init__.py (100%) rename seed/fastapi/circular-references/{resources => }/a/types/a.py (89%) rename seed/fastapi/circular-references/{resources => }/ast/__init__.py (100%) rename seed/fastapi/circular-references/{resources => }/ast/types/__init__.py (100%) rename seed/fastapi/circular-references/{resources => }/ast/types/container_value.py (97%) rename seed/fastapi/circular-references/{resources => }/ast/types/field_value.py (64%) rename seed/fastapi/circular-references/{resources => }/ast/types/object_value.py (93%) rename seed/fastapi/circular-references/{resources => }/ast/types/primitive_value.py (100%) delete mode 100644 seed/fastapi/circular-references/resources/__init__.py rename seed/fastapi/custom-auth/{resources => }/custom_auth/__init__.py (100%) rename seed/fastapi/custom-auth/{resources => }/custom_auth/service/__init__.py (100%) rename seed/fastapi/custom-auth/{resources => }/custom_auth/service/service.py (95%) rename seed/fastapi/custom-auth/{resources => }/errors/__init__.py (100%) rename seed/fastapi/custom-auth/{resources => }/errors/errors/__init__.py (100%) rename seed/fastapi/{basic-auth/resources => custom-auth}/errors/errors/bad_request.py (73%) rename seed/fastapi/{basic-auth/resources => custom-auth}/errors/errors/unauthorized_request.py (82%) rename seed/fastapi/custom-auth/{resources => }/errors/types/__init__.py (100%) rename seed/fastapi/{basic-auth/resources => custom-auth}/errors/types/unauthorized_request_error_body.py (93%) delete mode 100644 seed/fastapi/custom-auth/resources/__init__.py delete mode 100644 seed/fastapi/enum-query-params/resources/__init__.py rename seed/fastapi/enum-query-params/{resources => }/svc/__init__.py (100%) rename seed/fastapi/enum-query-params/{resources => }/svc/service/__init__.py (100%) rename seed/fastapi/enum-query-params/{resources => }/svc/service/service.py (93%) rename seed/fastapi/enum-query-params/{resources => }/svc/types/__init__.py (100%) rename seed/fastapi/enum-query-params/{resources => }/svc/types/my_enum.py (100%) rename seed/fastapi/error-property/{resources => }/errors/__init__.py (100%) rename seed/fastapi/error-property/{resources => }/errors/errors/__init__.py (100%) rename seed/fastapi/error-property/{resources => }/errors/errors/property_based_error_test.py (82%) rename seed/fastapi/error-property/{resources => }/errors/types/__init__.py (100%) rename seed/fastapi/error-property/{resources => }/errors/types/property_based_error_test_body.py (93%) rename seed/fastapi/error-property/{resources => }/property_based_error/__init__.py (100%) rename seed/fastapi/error-property/{resources => }/property_based_error/service/__init__.py (100%) rename seed/fastapi/error-property/{resources => }/property_based_error/service/service.py (93%) rename seed/fastapi/examples/{resources/commons/resources => commons}/__init__.py (100%) rename seed/fastapi/examples/{resources/commons/resources => commons}/types/__init__.py (100%) rename seed/fastapi/examples/{resources/commons/resources => commons}/types/types/__init__.py (100%) rename seed/fastapi/examples/{resources/commons/resources => commons}/types/types/data.py (94%) rename seed/fastapi/examples/{resources/commons/resources => commons}/types/types/event_info.py (67%) rename seed/fastapi/examples/{resources/commons/resources => commons}/types/types/metadata.py (90%) rename seed/fastapi/examples/{resources/commons/resources => commons}/types/types/tag.py (94%) rename seed/fastapi/examples/{resources/file/resources => file}/__init__.py (100%) rename seed/fastapi/examples/{resources/file/resources/notification/resources => file/notification}/service/__init__.py (100%) rename seed/fastapi/examples/{resources/file/resources/notification/resources => file/notification}/service/service/__init__.py (100%) rename seed/fastapi/examples/{resources/file/resources/notification/resources => file/notification}/service/service/service.py (90%) rename seed/fastapi/examples/{resources/file/resources => file}/service/__init__.py (100%) rename seed/fastapi/examples/{resources/file/resources => file}/service/service/__init__.py (100%) rename seed/fastapi/examples/{resources/file/resources => file}/service/service/service.py (89%) rename seed/fastapi/examples/{resources/file/resources => file}/service/types/__init__.py (100%) rename seed/fastapi/examples/{resources/file/resources => file}/service/types/filename.py (94%) rename seed/fastapi/examples/{resources/health/resources => health}/service/__init__.py (100%) rename seed/fastapi/examples/{resources/health/resources => health}/service/service/__init__.py (100%) rename seed/fastapi/examples/{resources/health/resources => health}/service/service/service.py (95%) delete mode 100644 seed/fastapi/examples/resources/__init__.py delete mode 100644 seed/fastapi/examples/resources/commons/__init__.py delete mode 100644 seed/fastapi/examples/resources/file/__init__.py rename seed/fastapi/examples/{resources => }/service/service/__init__.py (100%) rename seed/fastapi/examples/{resources => }/service/service/service.py (97%) rename seed/fastapi/examples/{resources => }/types/__init__.py (100%) rename seed/fastapi/examples/{resources => }/types/errors/__init__.py (100%) rename seed/fastapi/{folders/resources/folder/resources/service => examples/types}/errors/not_found_error.py (75%) rename seed/fastapi/examples/{resources => }/types/types/__init__.py (100%) rename seed/fastapi/examples/{resources => }/types/types/actor.py (93%) rename seed/fastapi/examples/{resources => }/types/types/actress.py (94%) rename seed/fastapi/examples/{resources => }/types/types/cast_member.py (100%) rename seed/fastapi/examples/{resources => }/types/types/directory.py (96%) rename seed/fastapi/examples/{resources => }/types/types/exception.py (97%) rename seed/fastapi/examples/{resources => }/types/types/exception_info.py (95%) rename seed/fastapi/examples/{resources => }/types/types/extended_movie.py (95%) rename seed/fastapi/examples/{resources => }/types/types/file.py (94%) rename seed/fastapi/examples/{resources => }/types/types/metadata.py (97%) rename seed/fastapi/examples/{resources => }/types/types/migration.py (94%) rename seed/fastapi/examples/{resources => }/types/types/migration_status.py (100%) rename seed/fastapi/examples/{resources => }/types/types/moment.py (95%) rename seed/fastapi/examples/{resources => }/types/types/movie.py (92%) rename seed/fastapi/examples/{resources => }/types/types/movie_id.py (94%) rename seed/fastapi/examples/{resources => }/types/types/node.py (96%) rename seed/fastapi/examples/{resources => }/types/types/request.py (94%) rename seed/fastapi/examples/{resources => }/types/types/response.py (94%) rename seed/fastapi/examples/{resources => }/types/types/stunt_double.py (94%) rename seed/fastapi/examples/{resources => }/types/types/test.py (97%) rename seed/fastapi/examples/{resources => }/types/types/tree.py (95%) rename seed/fastapi/{examples/resources/service => exhaustive/no-custom-config/endpoints/container}/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources => endpoints}/container/service/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources => endpoints}/container/service/service.py (98%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources/container => endpoints/enum}/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources => endpoints}/enum/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v2/resources/endpoints/resources => no-custom-config/endpoints}/enum/service/service.py (90%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources/enum => endpoints/http_methods}/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources => endpoints}/http_methods/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v2/resources/endpoints/resources => no-custom-config/endpoints}/http_methods/service/service.py (96%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources/http_methods => endpoints/object}/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources => endpoints}/object/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v1/resources/endpoints/resources => no-custom-config/endpoints}/object/service/service.py (94%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources/object => endpoints/params}/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources => endpoints}/params/service/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources => endpoints}/params/service/service.py (98%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources/params => endpoints/primitive}/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources => endpoints}/primitive/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v2/resources/endpoints/resources => no-custom-config/endpoints}/primitive/service/service.py (98%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources/primitive => endpoints/union}/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources => endpoints}/union/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v2/resources/endpoints/resources => no-custom-config/endpoints}/union/service/service.py (90%) rename seed/fastapi/exhaustive/no-custom-config/{resources => }/general_errors/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources => }/general_errors/errors/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v1/resources => no-custom-config}/general_errors/errors/bad_request_body.py (81%) rename seed/fastapi/exhaustive/no-custom-config/{resources => }/general_errors/types/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources => }/general_errors/types/bad_object_request_info.py (93%) rename seed/fastapi/exhaustive/no-custom-config/{resources => }/inlined_requests/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources => }/inlined_requests/service/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources => }/inlined_requests/service/post_with_object_body.py (86%) rename seed/fastapi/exhaustive/{pydantic-v1/resources => no-custom-config}/inlined_requests/service/service.py (92%) rename seed/fastapi/exhaustive/no-custom-config/{resources/endpoints/resources/union => no_auth}/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources => }/no_auth/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v1/resources => no-custom-config}/no_auth/service/service.py (94%) rename seed/fastapi/exhaustive/no-custom-config/{resources/no_auth => no_req_body}/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources => }/no_req_body/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v1/resources => no-custom-config}/no_req_body/service/service.py (93%) rename seed/fastapi/exhaustive/no-custom-config/{resources/no_req_body => req_with_headers}/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources => }/req_with_headers/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v2/resources => no-custom-config}/req_with_headers/service/service.py (93%) delete mode 100644 seed/fastapi/exhaustive/no-custom-config/resources/__init__.py delete mode 100644 seed/fastapi/exhaustive/no-custom-config/resources/types/__init__.py rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/enum/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/enum/errors/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v2/resources/types/resources => no-custom-config/types}/enum/errors/error_with_enum_body.py (80%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/enum/types/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/enum/types/weather_report.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/object/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/object/errors/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/object/errors/nested_object_with_optional_field_error.py (83%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/object/errors/nested_object_with_required_field_error.py (83%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/object/errors/object_with_optional_field_error.py (82%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/object/errors/object_with_required_field_error.py (82%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/object/types/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/object/types/nested_object_with_optional_field.py (94%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/object/types/nested_object_with_required_field.py (94%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/object/types/object_with_map_of_map.py (93%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/object/types/object_with_optional_field.py (95%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/object/types/object_with_required_field.py (93%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/union/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/union/errors/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v2/resources/types/resources => no-custom-config/types}/union/errors/error_with_union_body.py (78%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/union/types/__init__.py (100%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/union/types/animal.py (62%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/union/types/cat.py (94%) rename seed/fastapi/exhaustive/no-custom-config/{resources/types/resources => types}/union/types/dog.py (94%) rename seed/fastapi/exhaustive/{no-custom-config/resources/req_with_headers => pydantic-v1/endpoints/container}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/endpoints/resources => endpoints}/container/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v2/resources/endpoints/resources => pydantic-v1/endpoints}/container/service/service.py (98%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/endpoints/resources/container => endpoints/enum}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/endpoints/resources => endpoints}/enum/service/__init__.py (100%) rename seed/fastapi/exhaustive/{no-custom-config/resources/endpoints/resources => pydantic-v1/endpoints}/enum/service/service.py (90%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/endpoints/resources/enum => endpoints/http_methods}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/endpoints/resources => endpoints}/http_methods/service/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/endpoints/resources => endpoints}/http_methods/service/service.py (96%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/endpoints/resources/http_methods => endpoints/object}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/endpoints/resources => endpoints}/object/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v2/resources/endpoints/resources => pydantic-v1/endpoints}/object/service/service.py (94%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/endpoints/resources/object => endpoints/params}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/endpoints/resources => endpoints}/params/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v2/resources/endpoints/resources => pydantic-v1/endpoints}/params/service/service.py (98%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/endpoints/resources/params => endpoints/primitive}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/endpoints/resources => endpoints}/primitive/service/__init__.py (100%) rename seed/fastapi/exhaustive/{no-custom-config/resources/endpoints/resources => pydantic-v1/endpoints}/primitive/service/service.py (98%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/endpoints/resources/primitive => endpoints/union}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/endpoints/resources => endpoints}/union/service/__init__.py (100%) rename seed/fastapi/exhaustive/{no-custom-config/resources/endpoints/resources => pydantic-v1/endpoints}/union/service/service.py (90%) rename seed/fastapi/exhaustive/pydantic-v1/{resources => }/general_errors/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources => }/general_errors/errors/__init__.py (100%) rename seed/fastapi/exhaustive/{no-custom-config/resources => pydantic-v1}/general_errors/errors/bad_request_body.py (81%) rename seed/fastapi/exhaustive/pydantic-v1/{resources => }/general_errors/types/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources => }/general_errors/types/bad_object_request_info.py (92%) rename seed/fastapi/exhaustive/pydantic-v1/{resources => }/inlined_requests/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources => }/inlined_requests/service/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources => }/inlined_requests/service/post_with_object_body.py (85%) rename seed/fastapi/exhaustive/{pydantic-v2/resources => pydantic-v1}/inlined_requests/service/service.py (92%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/endpoints/resources/union => no_auth}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources => }/no_auth/service/__init__.py (100%) rename seed/fastapi/exhaustive/{no-custom-config/resources => pydantic-v1}/no_auth/service/service.py (94%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/no_auth => no_req_body}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources => }/no_req_body/service/__init__.py (100%) rename seed/fastapi/exhaustive/{no-custom-config/resources => pydantic-v1}/no_req_body/service/service.py (93%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/no_req_body => req_with_headers}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources => }/req_with_headers/service/__init__.py (100%) rename seed/fastapi/exhaustive/{no-custom-config/resources => pydantic-v1}/req_with_headers/service/service.py (93%) delete mode 100644 seed/fastapi/exhaustive/pydantic-v1/resources/__init__.py delete mode 100644 seed/fastapi/exhaustive/pydantic-v1/resources/types/__init__.py rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/enum/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/enum/errors/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/enum/errors/error_with_enum_body.py (80%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/enum/types/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/enum/types/weather_report.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/object/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/object/errors/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/object/errors/nested_object_with_optional_field_error.py (83%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/object/errors/nested_object_with_required_field_error.py (83%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/object/errors/object_with_optional_field_error.py (82%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/object/errors/object_with_required_field_error.py (82%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/object/types/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/object/types/nested_object_with_optional_field.py (94%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/object/types/nested_object_with_required_field.py (94%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/object/types/object_with_map_of_map.py (92%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/object/types/object_with_optional_field.py (95%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/object/types/object_with_required_field.py (92%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/union/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/union/errors/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/union/errors/error_with_union_body.py (78%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/union/types/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/union/types/animal.py (61%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/union/types/cat.py (93%) rename seed/fastapi/exhaustive/pydantic-v1/{resources/types/resources => types}/union/types/dog.py (93%) rename seed/fastapi/exhaustive/{pydantic-v1/resources/req_with_headers => pydantic-v2/endpoints/container}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/endpoints/resources => endpoints}/container/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v1/resources/endpoints/resources => pydantic-v2/endpoints}/container/service/service.py (98%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/endpoints/resources/container => endpoints/enum}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/endpoints/resources => endpoints}/enum/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v1/resources/endpoints/resources => pydantic-v2/endpoints}/enum/service/service.py (90%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/endpoints/resources/enum => endpoints/http_methods}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/endpoints/resources => endpoints}/http_methods/service/__init__.py (100%) rename seed/fastapi/exhaustive/{no-custom-config/resources/endpoints/resources => pydantic-v2/endpoints}/http_methods/service/service.py (96%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/endpoints/resources/http_methods => endpoints/object}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/endpoints/resources => endpoints}/object/service/__init__.py (100%) rename seed/fastapi/exhaustive/{no-custom-config/resources/endpoints/resources => pydantic-v2/endpoints}/object/service/service.py (94%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/endpoints/resources/object => endpoints/params}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/endpoints/resources => endpoints}/params/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v1/resources/endpoints/resources => pydantic-v2/endpoints}/params/service/service.py (98%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/endpoints/resources/params => endpoints/primitive}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/endpoints/resources => endpoints}/primitive/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v1/resources/endpoints/resources => pydantic-v2/endpoints}/primitive/service/service.py (98%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/endpoints/resources/primitive => endpoints/union}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/endpoints/resources => endpoints}/union/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v1/resources/endpoints/resources => pydantic-v2/endpoints}/union/service/service.py (90%) rename seed/fastapi/exhaustive/pydantic-v2/{resources => }/general_errors/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources => }/general_errors/errors/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources => }/general_errors/errors/bad_request_body.py (81%) rename seed/fastapi/exhaustive/pydantic-v2/{resources => }/general_errors/types/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources => }/general_errors/types/bad_object_request_info.py (93%) rename seed/fastapi/exhaustive/pydantic-v2/{resources => }/inlined_requests/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources => }/inlined_requests/service/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources => }/inlined_requests/service/post_with_object_body.py (85%) rename seed/fastapi/exhaustive/{no-custom-config/resources => pydantic-v2}/inlined_requests/service/service.py (92%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/endpoints/resources/union => no_auth}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources => }/no_auth/service/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources => }/no_auth/service/service.py (94%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/no_auth => no_req_body}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources => }/no_req_body/service/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources => }/no_req_body/service/service.py (93%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/no_req_body => req_with_headers}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources => }/req_with_headers/service/__init__.py (100%) rename seed/fastapi/exhaustive/{pydantic-v1/resources => pydantic-v2}/req_with_headers/service/service.py (93%) delete mode 100644 seed/fastapi/exhaustive/pydantic-v2/resources/__init__.py delete mode 100644 seed/fastapi/exhaustive/pydantic-v2/resources/types/__init__.py rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/enum/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/enum/errors/__init__.py (100%) rename seed/fastapi/exhaustive/{no-custom-config/resources/types/resources => pydantic-v2/types}/enum/errors/error_with_enum_body.py (80%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/enum/types/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/enum/types/weather_report.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/object/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/object/errors/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/object/errors/nested_object_with_optional_field_error.py (83%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/object/errors/nested_object_with_required_field_error.py (83%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/object/errors/object_with_optional_field_error.py (82%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/object/errors/object_with_required_field_error.py (82%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/object/types/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/object/types/nested_object_with_optional_field.py (94%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/object/types/nested_object_with_required_field.py (94%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/object/types/object_with_map_of_map.py (93%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/object/types/object_with_optional_field.py (95%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/object/types/object_with_required_field.py (92%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/union/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/union/errors/__init__.py (100%) rename seed/fastapi/exhaustive/{no-custom-config/resources/types/resources => pydantic-v2/types}/union/errors/error_with_union_body.py (78%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/union/types/__init__.py (100%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/union/types/animal.py (61%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/union/types/cat.py (93%) rename seed/fastapi/exhaustive/pydantic-v2/{resources/types/resources => types}/union/types/dog.py (93%) rename seed/fastapi/exhaustive/{pydantic-v2/resources/req_with_headers => skip-formatting/endpoints/container}/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources => endpoints}/container/service/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources => endpoints}/container/service/service.py (98%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources/container => endpoints/enum}/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources => endpoints}/enum/service/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources => endpoints}/enum/service/service.py (89%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources/enum => endpoints/http_methods}/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources => endpoints}/http_methods/service/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources => endpoints}/http_methods/service/service.py (96%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources/http_methods => endpoints/object}/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources => endpoints}/object/service/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources => endpoints}/object/service/service.py (94%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources/object => endpoints/params}/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources => endpoints}/params/service/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources => endpoints}/params/service/service.py (98%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources/params => endpoints/primitive}/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources => endpoints}/primitive/service/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources => endpoints}/primitive/service/service.py (98%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources/primitive => endpoints/union}/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources => endpoints}/union/service/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources => endpoints}/union/service/service.py (90%) rename seed/fastapi/exhaustive/skip-formatting/{resources => }/general_errors/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources => }/general_errors/errors/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources => }/general_errors/errors/bad_request_body.py (81%) rename seed/fastapi/exhaustive/skip-formatting/{resources => }/general_errors/types/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources => }/general_errors/types/bad_object_request_info.py (93%) rename seed/fastapi/exhaustive/skip-formatting/{resources => }/inlined_requests/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources => }/inlined_requests/service/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources => }/inlined_requests/service/post_with_object_body.py (86%) rename seed/fastapi/exhaustive/skip-formatting/{resources => }/inlined_requests/service/service.py (92%) rename seed/fastapi/exhaustive/skip-formatting/{resources/endpoints/resources/union => no_auth}/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources => }/no_auth/service/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources => }/no_auth/service/service.py (94%) rename seed/fastapi/exhaustive/skip-formatting/{resources/no_auth => no_req_body}/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources => }/no_req_body/service/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources => }/no_req_body/service/service.py (93%) rename seed/fastapi/exhaustive/skip-formatting/{resources/no_req_body => req_with_headers}/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources => }/req_with_headers/service/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources => }/req_with_headers/service/service.py (92%) delete mode 100644 seed/fastapi/exhaustive/skip-formatting/resources/__init__.py delete mode 100644 seed/fastapi/exhaustive/skip-formatting/resources/types/__init__.py rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/enum/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/enum/errors/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/enum/errors/error_with_enum_body.py (79%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/enum/types/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/enum/types/weather_report.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/object/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/object/errors/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/object/errors/nested_object_with_optional_field_error.py (83%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/object/errors/nested_object_with_required_field_error.py (83%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/object/errors/object_with_optional_field_error.py (82%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/object/errors/object_with_required_field_error.py (82%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/object/types/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/object/types/nested_object_with_optional_field.py (94%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/object/types/nested_object_with_required_field.py (94%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/object/types/object_with_map_of_map.py (93%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/object/types/object_with_optional_field.py (95%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/object/types/object_with_required_field.py (93%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/union/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/union/errors/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/union/errors/error_with_union_body.py (78%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/union/types/__init__.py (100%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/union/types/animal.py (65%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/union/types/cat.py (94%) rename seed/fastapi/exhaustive/skip-formatting/{resources/types/resources => types}/union/types/dog.py (94%) rename seed/fastapi/folders/{resources/a/resources => a}/__init__.py (100%) rename seed/fastapi/{exhaustive/skip-formatting/resources/req_with_headers => folders/a/b}/__init__.py (100%) rename seed/fastapi/folders/{resources/a/resources => a}/b/service/__init__.py (100%) rename seed/fastapi/folders/{resources/a/resources => a}/b/service/service.py (92%) rename seed/fastapi/folders/{resources/a/resources/b => a/c}/__init__.py (100%) rename seed/fastapi/folders/{resources/a/resources => a}/c/service/__init__.py (100%) rename seed/fastapi/folders/{resources/a/resources => a}/c/service/service.py (92%) rename seed/fastapi/folders/{resources/a/resources/d/resources => a/d}/__init__.py (100%) rename seed/fastapi/folders/{resources/a/resources/d/resources => a/d}/types/__init__.py (100%) rename seed/fastapi/folders/{resources/a/resources/d/resources => a/d}/types/types/__init__.py (100%) rename seed/fastapi/folders/{resources/a/resources/d/resources => a/d}/types/types/foo.py (94%) rename seed/fastapi/folders/{resources/folder/resources => folder}/__init__.py (100%) rename seed/fastapi/folders/{resources => }/folder/service/__init__.py (55%) rename seed/fastapi/folders/{resources/folder/resources => folder}/service/errors/__init__.py (100%) rename seed/fastapi/{examples/resources/types => folders/folder/service}/errors/not_found_error.py (100%) rename seed/fastapi/folders/{resources => }/folder/service/service.py (93%) rename seed/fastapi/folders/{resources/folder/resources => folder}/service/service/__init__.py (100%) rename seed/fastapi/folders/{resources/folder/resources => folder}/service/service/service.py (96%) delete mode 100644 seed/fastapi/folders/resources/__init__.py delete mode 100644 seed/fastapi/folders/resources/a/__init__.py delete mode 100644 seed/fastapi/folders/resources/a/resources/d/__init__.py delete mode 100644 seed/fastapi/folders/resources/folder/__init__.py delete mode 100644 seed/fastapi/folders/resources/folder/resources/service/__init__.py rename seed/fastapi/idempotency-headers/{resources => }/payment/__init__.py (100%) rename seed/fastapi/idempotency-headers/{resources => }/payment/service/__init__.py (100%) rename seed/fastapi/idempotency-headers/{resources => }/payment/service/create_payment_request.py (94%) rename seed/fastapi/idempotency-headers/{resources => }/payment/service/service.py (95%) rename seed/fastapi/idempotency-headers/{resources => }/payment/types/__init__.py (100%) rename seed/fastapi/idempotency-headers/{resources => }/payment/types/currency.py (100%) delete mode 100644 seed/fastapi/idempotency-headers/resources/__init__.py rename seed/fastapi/imdb/{resources => }/imdb/__init__.py (100%) rename seed/fastapi/imdb/{resources => }/imdb/errors/__init__.py (100%) rename seed/fastapi/imdb/{resources => }/imdb/errors/movie_does_not_exist_error.py (80%) rename seed/fastapi/imdb/{resources => }/imdb/service/__init__.py (100%) rename seed/fastapi/imdb/{resources => }/imdb/service/service.py (96%) rename seed/fastapi/imdb/{resources => }/imdb/types/__init__.py (100%) rename seed/fastapi/imdb/{resources => }/imdb/types/create_movie_request.py (93%) rename seed/fastapi/imdb/{resources => }/imdb/types/movie.py (94%) rename seed/fastapi/imdb/{resources => }/imdb/types/movie_id.py (94%) delete mode 100644 seed/fastapi/imdb/resources/__init__.py rename seed/fastapi/literal/{resources => }/literal/__init__.py (100%) rename seed/fastapi/literal/{resources => }/literal/service/__init__.py (100%) rename seed/fastapi/literal/{resources => }/literal/service/create_options_request.py (93%) rename seed/fastapi/literal/{resources => }/literal/service/get_options_request.py (94%) rename seed/fastapi/literal/{resources => }/literal/service/get_undiscriminated_options_request.py (94%) rename seed/fastapi/literal/{resources => }/literal/service/service.py (97%) rename seed/fastapi/literal/{resources => }/literal/types/__init__.py (100%) rename seed/fastapi/literal/{resources => }/literal/types/create_options_response.py (80%) rename seed/fastapi/literal/{resources => }/literal/types/options.py (94%) rename seed/fastapi/literal/{resources => }/literal/types/undiscriminated_options.py (100%) delete mode 100644 seed/fastapi/literal/resources/__init__.py rename seed/fastapi/multi-url-environment/{resources => }/ec_2/__init__.py (100%) rename seed/fastapi/multi-url-environment/{resources => }/ec_2/service/__init__.py (100%) rename seed/fastapi/multi-url-environment/{resources => }/ec_2/service/boot_instance_request.py (93%) rename seed/fastapi/multi-url-environment/{resources => }/ec_2/service/service.py (92%) delete mode 100644 seed/fastapi/multi-url-environment/resources/__init__.py rename seed/fastapi/multi-url-environment/{resources => }/s_3/__init__.py (100%) rename seed/fastapi/multi-url-environment/{resources => }/s_3/service/__init__.py (100%) rename seed/fastapi/multi-url-environment/{resources => }/s_3/service/get_presigned_url_request.py (94%) rename seed/fastapi/multi-url-environment/{resources => }/s_3/service/service.py (92%) rename seed/fastapi/{folders/resources/a/resources/c => no-environment/dummy}/__init__.py (100%) rename seed/fastapi/no-environment/{resources => }/dummy/service/__init__.py (100%) rename seed/fastapi/{single-url-environment-default/resources => no-environment}/dummy/service/service.py (91%) rename seed/fastapi/objects-with-imports/{resources/commons/resources => commons}/__init__.py (100%) rename seed/fastapi/objects-with-imports/{resources/commons/resources => commons}/metadata/__init__.py (100%) rename seed/fastapi/objects-with-imports/{resources/commons/resources => commons}/metadata/types/__init__.py (100%) rename seed/fastapi/objects-with-imports/{resources/commons/resources => commons}/metadata/types/metadata.py (88%) rename seed/fastapi/objects-with-imports/{resources => }/file/__init__.py (73%) rename seed/fastapi/objects-with-imports/{resources/file/resources => file}/directory/__init__.py (100%) rename seed/fastapi/objects-with-imports/{resources/file/resources => file}/directory/types/__init__.py (100%) rename seed/fastapi/objects-with-imports/{resources/file/resources => file}/directory/types/directory.py (91%) rename seed/fastapi/objects-with-imports/{resources => }/file/types/__init__.py (100%) rename seed/fastapi/objects-with-imports/{resources => }/file/types/file.py (94%) rename seed/fastapi/objects-with-imports/{resources => }/file/types/file_info.py (100%) delete mode 100644 seed/fastapi/objects-with-imports/resources/__init__.py delete mode 100644 seed/fastapi/objects-with-imports/resources/commons/__init__.py rename seed/fastapi/{no-environment/resources/dummy => optional}/__init__.py (100%) create mode 100644 seed/fastapi/optional/core/__init__.py create mode 100644 seed/fastapi/optional/core/abstract_fern_service.py create mode 100644 seed/fastapi/optional/core/datetime_utils.py create mode 100644 seed/fastapi/optional/core/exceptions/__init__.py create mode 100644 seed/fastapi/optional/core/exceptions/fern_http_exception.py create mode 100644 seed/fastapi/optional/core/exceptions/handlers.py create mode 100644 seed/fastapi/optional/core/exceptions/unauthorized.py create mode 100644 seed/fastapi/optional/core/route_args.py rename seed/{sdk/audiences/src/seed/resources/folder_a/resources/service => fastapi/optional/core/security}/__init__.py (53%) create mode 100644 seed/fastapi/optional/core/security/bearer.py rename seed/fastapi/{package-yml/resources/service => optional/optional}/__init__.py (100%) create mode 100644 seed/fastapi/optional/optional/service/__init__.py create mode 100644 seed/fastapi/optional/optional/service/service.py create mode 100644 seed/fastapi/optional/register.py create mode 100644 seed/fastapi/optional/snippet.json rename seed/fastapi/package-yml/{resources => }/service/service/__init__.py (100%) rename seed/fastapi/package-yml/{resources => }/service/service/service.py (93%) rename seed/fastapi/plain-text/{resources => }/service/__init__.py (100%) rename seed/fastapi/plain-text/{resources => }/service/service/__init__.py (100%) rename seed/fastapi/plain-text/{resources => }/service/service/service.py (93%) rename seed/fastapi/reserved-keywords/{resources => }/package/__init__.py (100%) rename seed/fastapi/reserved-keywords/{resources => }/package/service/__init__.py (100%) rename seed/fastapi/reserved-keywords/{resources => }/package/service/service.py (93%) rename seed/fastapi/reserved-keywords/{resources => }/package/types/__init__.py (100%) rename seed/fastapi/reserved-keywords/{resources => }/package/types/package.py (93%) rename seed/fastapi/reserved-keywords/{resources => }/package/types/record.py (94%) delete mode 100644 seed/fastapi/reserved-keywords/resources/__init__.py rename seed/fastapi/single-url-environment-default/{resources => }/dummy/__init__.py (100%) rename seed/fastapi/single-url-environment-default/{resources => }/dummy/service/__init__.py (100%) rename seed/fastapi/{no-environment/resources => single-url-environment-default}/dummy/service/service.py (91%) rename seed/fastapi/single-url-environment-no-default/{resources => }/dummy/__init__.py (100%) rename seed/fastapi/single-url-environment-no-default/{resources => }/dummy/service/__init__.py (100%) rename seed/fastapi/single-url-environment-no-default/{resources => }/dummy/service/service.py (91%) rename seed/fastapi/trace/{resources => }/admin/__init__.py (100%) rename seed/fastapi/trace/{resources => }/admin/service/__init__.py (100%) rename seed/fastapi/trace/{resources => }/admin/service/service.py (99%) rename seed/fastapi/trace/{resources => }/admin/service/store_traced_test_case_request.py (95%) rename seed/fastapi/trace/{resources => }/admin/service/store_traced_workspace_request.py (95%) rename seed/fastapi/trace/{resources => }/admin/types/__init__.py (100%) rename seed/fastapi/trace/{resources => }/admin/types/test.py (97%) rename seed/fastapi/trace/{resources => }/commons/__init__.py (100%) rename seed/fastapi/trace/{resources => }/commons/types/__init__.py (100%) rename seed/fastapi/trace/{resources => }/commons/types/binary_tree_node_and_tree_value.py (95%) rename seed/fastapi/trace/{resources => }/commons/types/binary_tree_node_value.py (94%) rename seed/fastapi/trace/{resources => }/commons/types/binary_tree_value.py (94%) rename seed/fastapi/trace/{resources => }/commons/types/debug_key_value_pairs.py (94%) rename seed/fastapi/trace/{resources => }/commons/types/debug_map_value.py (95%) rename seed/fastapi/trace/{resources => }/commons/types/debug_variable_value.py (94%) rename seed/fastapi/trace/{resources => }/commons/types/doubly_linked_list_node_and_list_value.py (95%) rename seed/fastapi/trace/{resources => }/commons/types/doubly_linked_list_node_value.py (94%) rename seed/fastapi/trace/{resources => }/commons/types/doubly_linked_list_value.py (94%) rename seed/fastapi/trace/{resources => }/commons/types/file_info.py (93%) rename seed/fastapi/trace/{resources => }/commons/types/generic_value.py (94%) rename seed/fastapi/trace/{resources => }/commons/types/key_value_pair.py (94%) rename seed/fastapi/trace/{resources => }/commons/types/language.py (100%) rename seed/fastapi/trace/{resources => }/commons/types/list_type.py (95%) rename seed/fastapi/trace/{resources => }/commons/types/map_type.py (95%) rename seed/fastapi/trace/{resources => }/commons/types/map_value.py (95%) rename seed/fastapi/trace/{resources => }/commons/types/node_id.py (94%) rename seed/fastapi/trace/{resources => }/commons/types/problem_id.py (94%) rename seed/fastapi/trace/{resources => }/commons/types/singly_linked_list_node_and_list_value.py (95%) rename seed/fastapi/trace/{resources => }/commons/types/singly_linked_list_node_value.py (94%) rename seed/fastapi/trace/{resources => }/commons/types/singly_linked_list_value.py (94%) rename seed/fastapi/trace/{resources => }/commons/types/test_case.py (94%) rename seed/fastapi/trace/{resources => }/commons/types/test_case_with_expected_result.py (95%) rename seed/fastapi/trace/{resources => }/commons/types/user_id.py (94%) rename seed/fastapi/trace/{resources => }/commons/types/variable_type.py (81%) rename seed/fastapi/trace/{resources => }/commons/types/variable_value.py (77%) rename seed/fastapi/trace/{resources => }/homepage/__init__.py (100%) rename seed/fastapi/trace/{resources => }/homepage/service/__init__.py (100%) rename seed/fastapi/trace/{resources => }/homepage/service/service.py (96%) rename seed/fastapi/trace/{resources => }/lang_server/__init__.py (100%) rename seed/fastapi/trace/{resources => }/lang_server/types/__init__.py (100%) rename seed/fastapi/trace/{resources => }/lang_server/types/lang_server_request.py (93%) rename seed/fastapi/trace/{resources => }/lang_server/types/lang_server_response.py (93%) rename seed/fastapi/trace/{resources => }/migration/__init__.py (100%) rename seed/fastapi/trace/{resources => }/migration/service/__init__.py (100%) rename seed/fastapi/trace/{resources => }/migration/service/service.py (94%) rename seed/fastapi/trace/{resources => }/migration/types/__init__.py (100%) rename seed/fastapi/trace/{resources => }/migration/types/migration.py (94%) rename seed/fastapi/trace/{resources => }/migration/types/migration_status.py (100%) rename seed/fastapi/trace/{resources => }/playlist/__init__.py (100%) rename seed/fastapi/trace/{resources => }/playlist/errors/__init__.py (100%) rename seed/fastapi/trace/{resources => }/playlist/errors/playlist_id_not_found_error.py (83%) rename seed/fastapi/trace/{resources => }/playlist/errors/unauthorized_error.py (75%) rename seed/fastapi/trace/{resources => }/playlist/service/__init__.py (100%) rename seed/fastapi/trace/{resources => }/playlist/service/service.py (98%) rename seed/fastapi/trace/{resources => }/playlist/types/__init__.py (100%) rename seed/fastapi/trace/{resources => }/playlist/types/playlist.py (95%) rename seed/fastapi/trace/{resources => }/playlist/types/playlist_create_request.py (94%) rename seed/fastapi/trace/{resources => }/playlist/types/playlist_id.py (94%) rename seed/fastapi/trace/{resources => }/playlist/types/playlist_id_not_found_error_body.py (77%) rename seed/fastapi/trace/{resources => }/playlist/types/reserved_keyword_enum.py (100%) rename seed/fastapi/trace/{resources => }/playlist/types/update_playlist_request.py (94%) rename seed/fastapi/trace/{resources => }/problem/__init__.py (100%) rename seed/fastapi/trace/{resources => }/problem/service/__init__.py (100%) rename seed/fastapi/trace/{resources => }/problem/service/get_default_starter_files_request.py (96%) rename seed/fastapi/trace/{resources => }/problem/service/service.py (98%) rename seed/fastapi/trace/{resources => }/problem/types/__init__.py (100%) rename seed/fastapi/trace/{resources => }/problem/types/create_problem_error.py (97%) rename seed/fastapi/trace/{resources => }/problem/types/create_problem_request.py (96%) rename seed/fastapi/trace/{resources => }/problem/types/create_problem_response.py (97%) rename seed/fastapi/trace/{resources => }/problem/types/generic_create_problem_error.py (93%) rename seed/fastapi/trace/{resources => }/problem/types/get_default_starter_files_response.py (94%) rename seed/fastapi/trace/{resources => }/problem/types/problem_description.py (94%) rename seed/fastapi/trace/{resources => }/problem/types/problem_description_board.py (98%) rename seed/fastapi/trace/{resources => }/problem/types/problem_files.py (94%) rename seed/fastapi/trace/{resources => }/problem/types/problem_info.py (97%) rename seed/fastapi/trace/{resources => }/problem/types/update_problem_response.py (94%) rename seed/fastapi/trace/{resources => }/problem/types/variable_type_and_name.py (94%) delete mode 100644 seed/fastapi/trace/resources/__init__.py delete mode 100644 seed/fastapi/trace/resources/v_2/__init__.py delete mode 100644 seed/fastapi/trace/resources/v_2/resources/v_3/__init__.py rename seed/fastapi/trace/{resources => }/submission/__init__.py (100%) rename seed/fastapi/trace/{resources => }/submission/service/__init__.py (100%) rename seed/fastapi/trace/{resources => }/submission/service/service.py (98%) rename seed/fastapi/trace/{resources => }/submission/types/__init__.py (100%) rename seed/fastapi/trace/{resources => }/submission/types/actual_result.py (86%) rename seed/fastapi/trace/{resources => }/submission/types/building_executor_response.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/code_execution_update.py (99%) rename seed/fastapi/trace/{resources => }/submission/types/compile_error.py (93%) rename seed/fastapi/trace/{resources => }/submission/types/custom_test_cases_unsupported.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/error_info.py (60%) rename seed/fastapi/trace/{resources => }/submission/types/errored_response.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/exception_info.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/exception_v_2.py (97%) rename seed/fastapi/trace/{resources => }/submission/types/execution_session_response.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/execution_session_state.py (89%) rename seed/fastapi/trace/{resources => }/submission/types/execution_session_status.py (100%) rename seed/fastapi/trace/{resources => }/submission/types/existing_submission_executing.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/expression_location.py (93%) rename seed/fastapi/trace/{resources => }/submission/types/finished_response.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/get_execution_session_state_response.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/get_submission_state_response.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/get_trace_responses_page_request.py (93%) rename seed/fastapi/trace/{resources => }/submission/types/graded_response.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/graded_response_v_2.py (89%) rename seed/fastapi/trace/{resources => }/submission/types/graded_test_case_update.py (88%) rename seed/fastapi/trace/{resources => }/submission/types/initialize_problem_request.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/internal_error.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/invalid_request_cause.py (78%) rename seed/fastapi/trace/{resources => }/submission/types/invalid_request_response.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/lightweight_stackframe_information.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/recorded_response_notification.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/recorded_test_case_update.py (89%) rename seed/fastapi/trace/{resources => }/submission/types/recording_response_notification.py (96%) rename seed/fastapi/trace/{resources => }/submission/types/running_response.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/running_submission_state.py (100%) rename seed/fastapi/trace/{resources => }/submission/types/runtime_error.py (93%) rename seed/fastapi/trace/{resources => }/submission/types/scope.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/share_id.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/stack_frame.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/stack_information.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/stderr_response.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/stdout_response.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/stop_request.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/stopped_response.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/submission_file_info.py (93%) rename seed/fastapi/trace/{resources => }/submission/types/submission_id.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/submission_id_not_found.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/submission_request.py (89%) rename seed/fastapi/trace/{resources => }/submission/types/submission_response.py (90%) rename seed/fastapi/trace/{resources => }/submission/types/submission_status_for_test_case.py (98%) rename seed/fastapi/trace/{resources => }/submission/types/submission_status_v_2.py (98%) rename seed/fastapi/trace/{resources => }/submission/types/submission_type_enum.py (100%) rename seed/fastapi/trace/{resources => }/submission/types/submission_type_state.py (98%) rename seed/fastapi/trace/{resources => }/submission/types/submit_request_v_2.py (96%) rename seed/fastapi/trace/{resources => }/submission/types/terminated_response.py (93%) rename seed/fastapi/trace/{resources => }/submission/types/test_case_grade.py (97%) rename seed/fastapi/trace/{resources => }/submission/types/test_case_hidden_grade.py (93%) rename seed/fastapi/trace/{resources => }/submission/types/test_case_non_hidden_grade.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/test_case_result.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/test_case_result_with_stdout.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/test_submission_state.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/test_submission_status.py (98%) rename seed/fastapi/trace/{resources => }/submission/types/test_submission_status_v_2.py (90%) rename seed/fastapi/trace/{resources => }/submission/types/test_submission_update.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/test_submission_update_info.py (98%) rename seed/fastapi/trace/{resources => }/submission/types/trace_response.py (96%) rename seed/fastapi/trace/{resources => }/submission/types/trace_response_v_2.py (96%) rename seed/fastapi/trace/{resources => }/submission/types/trace_responses_page.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/trace_responses_page_v_2.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/traced_file.py (93%) rename seed/fastapi/trace/{resources => }/submission/types/traced_test_case.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/unexpected_language_error.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/workspace_files.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/workspace_ran_response.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/workspace_run_details.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/workspace_starter_files_response.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/workspace_starter_files_response_v_2.py (90%) rename seed/fastapi/trace/{resources => }/submission/types/workspace_submission_state.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/workspace_submission_status.py (98%) rename seed/fastapi/trace/{resources => }/submission/types/workspace_submission_status_v_2.py (94%) rename seed/fastapi/trace/{resources => }/submission/types/workspace_submission_update.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/workspace_submission_update_info.py (99%) rename seed/fastapi/trace/{resources => }/submission/types/workspace_submit_request.py (95%) rename seed/fastapi/trace/{resources => }/submission/types/workspace_traced_update.py (94%) rename seed/fastapi/trace/{resources => }/sysprop/__init__.py (100%) rename seed/fastapi/trace/{resources => }/sysprop/service/__init__.py (100%) rename seed/fastapi/trace/{resources => }/sysprop/service/service.py (96%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/__init__.py (100%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/__init__.py (100%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/service/__init__.py (100%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/service/service.py (98%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/__init__.py (100%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/assert_correctness_check.py (98%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2}/problem/types/basic_custom_files.py (92%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/basic_test_case_template.py (95%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2}/problem/types/create_problem_request_v_2.py (89%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2}/problem/types/custom_files.py (95%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/deep_equality_correctness_check.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2}/problem/types/default_provided_file.py (89%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/file_info_v_2.py (93%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/files.py (93%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/function_implementation.py (93%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2}/problem/types/function_implementation_for_multiple_languages.py (90%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/function_signature.py (98%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2}/problem/types/generated_files.py (91%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/get_basic_solution_file_request.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2}/problem/types/get_basic_solution_file_response.py (90%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/get_function_signature_request.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2}/problem/types/get_function_signature_response.py (89%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/get_generated_test_case_file_request.py (94%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/get_generated_test_case_template_file_request.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2}/problem/types/lightweight_problem_info_v_2.py (86%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/non_void_function_definition.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2}/problem/types/non_void_function_signature.py (89%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2}/problem/types/parameter.py (89%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/parameter_id.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2}/problem/types/problem_info_v_2.py (87%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/test_case_expects.py (94%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/test_case_function.py (98%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/test_case_id.py (94%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/test_case_implementation.py (94%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/test_case_implementation_description.py (94%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/test_case_implementation_description_board.py (97%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/test_case_implementation_reference.py (98%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/test_case_metadata.py (93%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/test_case_template.py (95%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/test_case_template_id.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2}/problem/types/test_case_v_2.py (90%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/test_case_with_actual_result_implementation.py (95%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/void_function_definition.py (94%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/void_function_definition_that_takes_actual_result.py (95%) rename seed/fastapi/trace/{resources/v_2/resources => v_2}/problem/types/void_function_signature.py (93%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2}/problem/types/void_function_signature_that_takes_actual_result.py (89%) rename seed/fastapi/trace/{resources => }/v_2/service/__init__.py (100%) rename seed/fastapi/trace/{resources => }/v_2/service/service.py (93%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/__init__.py (100%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/__init__.py (100%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/service/__init__.py (100%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/service/service.py (98%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/__init__.py (100%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/assert_correctness_check.py (98%) rename seed/fastapi/trace/{resources/v_2/resources => v_2/v_3}/problem/types/basic_custom_files.py (95%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/basic_test_case_template.py (95%) rename seed/fastapi/trace/{resources/v_2/resources => v_2/v_3}/problem/types/create_problem_request_v_2.py (96%) rename seed/fastapi/trace/{resources/v_2/resources => v_2/v_3}/problem/types/custom_files.py (97%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/deep_equality_correctness_check.py (94%) rename seed/fastapi/trace/{resources/v_2/resources => v_2/v_3}/problem/types/default_provided_file.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/file_info_v_2.py (93%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/files.py (93%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/function_implementation.py (93%) rename seed/fastapi/trace/{resources/v_2/resources => v_2/v_3}/problem/types/function_implementation_for_multiple_languages.py (95%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/function_signature.py (98%) rename seed/fastapi/trace/{resources/v_2/resources => v_2/v_3}/problem/types/generated_files.py (95%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/get_basic_solution_file_request.py (94%) rename seed/fastapi/trace/{resources/v_2/resources => v_2/v_3}/problem/types/get_basic_solution_file_response.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/get_function_signature_request.py (94%) rename seed/fastapi/trace/{resources/v_2/resources => v_2/v_3}/problem/types/get_function_signature_response.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/get_generated_test_case_file_request.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/get_generated_test_case_template_file_request.py (93%) rename seed/fastapi/trace/{resources/v_2/resources => v_2/v_3}/problem/types/lightweight_problem_info_v_2.py (95%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/non_void_function_definition.py (94%) rename seed/fastapi/trace/{resources/v_2/resources => v_2/v_3}/problem/types/non_void_function_signature.py (94%) rename seed/fastapi/trace/{resources/v_2/resources => v_2/v_3}/problem/types/parameter.py (95%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/parameter_id.py (94%) rename seed/fastapi/trace/{resources/v_2/resources => v_2/v_3}/problem/types/problem_info_v_2.py (97%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/test_case_expects.py (93%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/test_case_function.py (98%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/test_case_id.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/test_case_implementation.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/test_case_implementation_description.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/test_case_implementation_description_board.py (97%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/test_case_implementation_reference.py (98%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/test_case_metadata.py (93%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/test_case_template.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/test_case_template_id.py (94%) rename seed/fastapi/trace/{resources/v_2/resources => v_2/v_3}/problem/types/test_case_v_2.py (95%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/test_case_with_actual_result_implementation.py (95%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/void_function_definition.py (94%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/void_function_definition_that_takes_actual_result.py (95%) rename seed/fastapi/trace/{resources/v_2/resources/v_3/resources => v_2/v_3}/problem/types/void_function_signature.py (93%) rename seed/fastapi/trace/{resources/v_2/resources => v_2/v_3}/problem/types/void_function_signature_that_takes_actual_result.py (94%) delete mode 100644 seed/fastapi/undiscriminated-unions/resources/__init__.py rename seed/fastapi/undiscriminated-unions/{resources => }/union/__init__.py (100%) rename seed/fastapi/undiscriminated-unions/{resources => }/union/service/__init__.py (100%) rename seed/fastapi/undiscriminated-unions/{resources => }/union/service/service.py (93%) rename seed/fastapi/undiscriminated-unions/{resources => }/union/types/__init__.py (100%) rename seed/fastapi/undiscriminated-unions/{resources => }/union/types/my_union.py (100%) delete mode 100644 seed/fastapi/unknown/resources/__init__.py rename seed/fastapi/unknown/{resources => }/unknown/__init__.py (100%) rename seed/fastapi/unknown/{resources => }/unknown/service/__init__.py (100%) rename seed/fastapi/unknown/{resources => }/unknown/service/service.py (93%) rename seed/fastapi/unknown/{resources => }/unknown/types/__init__.py (100%) rename seed/fastapi/unknown/{resources => }/unknown/types/my_alias.py (94%) rename seed/fastapi/unknown/{resources => }/unknown/types/my_object.py (93%) rename seed/fastapi/variables/{resources => }/service/__init__.py (100%) rename seed/fastapi/variables/{resources => }/service/service/__init__.py (100%) rename seed/fastapi/variables/{resources => }/service/service/service.py (93%) create mode 100644 seed/pydantic/optional/.github/workflows/ci.yml create mode 100644 seed/pydantic/optional/.gitignore create mode 100644 seed/pydantic/optional/README.md create mode 100644 seed/pydantic/optional/poetry.lock create mode 100644 seed/pydantic/optional/pyproject.toml create mode 100644 seed/pydantic/optional/snippet.json rename seed/{sdk/api-wide-base-path/src/seed/resources/service => pydantic/optional/src/seed/objects_with_imports}/__init__.py (100%) create mode 100644 seed/pydantic/optional/src/seed/objects_with_imports/core/__init__.py create mode 100644 seed/pydantic/optional/src/seed/objects_with_imports/core/datetime_utils.py create mode 100644 seed/pydantic/optional/src/seed/objects_with_imports/py.typed create mode 100644 seed/pydantic/optional/tests/__init__.py create mode 100644 seed/pydantic/optional/tests/test_client.py rename seed/sdk/alias/src/seed/{types => }/object.py (100%) rename seed/sdk/alias/src/seed/{types => }/type.py (94%) rename seed/sdk/alias/src/seed/{types => }/type_id.py (100%) delete mode 100644 seed/sdk/alias/src/seed/types/__init__.py rename seed/sdk/{auth-environment-variables/src/seed/resources => api-wide-base-path/src/seed}/service/__init__.py (100%) rename seed/sdk/api-wide-base-path/src/seed/{resources/service/client.py => service/_client.py} (95%) rename seed/sdk/audiences/src/seed/{resources/commons/types => commons}/__init__.py (100%) rename seed/sdk/audiences/src/seed/{resources/commons/types => commons}/imported.py (100%) rename seed/sdk/audiences/src/seed/{resources/folder_a/resources => folder_a}/__init__.py (100%) rename seed/sdk/audiences/src/seed/{resources/folder_a/client.py => folder_a/_client.py} (77%) rename seed/sdk/audiences/src/seed/{resources/folder_a/resources/service/types => folder_a/service}/__init__.py (100%) rename seed/sdk/audiences/src/seed/{resources/folder_a/resources/service/client.py => folder_a/service/_client.py} (91%) rename seed/sdk/audiences/src/seed/{resources/folder_a/resources/service/types => folder_a/service}/response.py (87%) rename seed/sdk/audiences/src/seed/{resources/folder_b/resources => folder_b}/__init__.py (100%) rename seed/sdk/audiences/src/seed/{resources/folder_b/resources/common/types => folder_b/common}/__init__.py (100%) create mode 100644 seed/sdk/audiences/src/seed/folder_b/common/foo.py rename seed/sdk/audiences/src/seed/{resources/folder_c/resources => folder_c}/__init__.py (100%) rename seed/sdk/audiences/src/seed/{resources/folder_c/resources/common/types => folder_c/common}/__init__.py (100%) rename seed/sdk/audiences/src/seed/{resources/folder_c/resources/common/types => folder_c/common}/foo.py (93%) rename seed/sdk/audiences/src/seed/{resources/foo/types => foo}/__init__.py (100%) rename seed/sdk/audiences/src/seed/{resources/foo/client.py => foo/_client.py} (88%) rename seed/sdk/audiences/src/seed/{resources/foo/types => foo}/importing_type.py (89%) rename seed/sdk/audiences/src/seed/{resources/foo/types => foo}/optional_string.py (100%) delete mode 100644 seed/sdk/audiences/src/seed/resources/__init__.py delete mode 100644 seed/sdk/audiences/src/seed/resources/commons/__init__.py delete mode 100644 seed/sdk/audiences/src/seed/resources/folder_a/__init__.py delete mode 100644 seed/sdk/audiences/src/seed/resources/folder_b/__init__.py delete mode 100644 seed/sdk/audiences/src/seed/resources/folder_b/resources/common/types/foo.py delete mode 100644 seed/sdk/audiences/src/seed/resources/folder_c/__init__.py delete mode 100644 seed/sdk/audiences/src/seed/resources/folder_c/resources/common/__init__.py delete mode 100644 seed/sdk/audiences/src/seed/resources/foo/__init__.py rename seed/sdk/{basic-auth/src/seed/resources/basic_auth => auth-environment-variables/src/seed/service}/__init__.py (100%) rename seed/sdk/auth-environment-variables/src/seed/{resources/service/client.py => service/_client.py} (94%) rename seed/sdk/{bearer-token-environment-variable/src/seed/resources/service => basic-auth/src/seed/basic_auth}/__init__.py (100%) rename seed/sdk/basic-auth/src/seed/{resources/basic_auth/client.py => basic_auth/_client.py} (92%) rename seed/sdk/basic-auth/src/seed/{resources/errors => }/errors/__init__.py (50%) rename seed/sdk/{custom-auth/src/seed/resources/errors => basic-auth/src/seed}/errors/bad_request.py (80%) rename seed/sdk/basic-auth/src/seed/{resources/errors => }/errors/unauthorized_request.py (64%) rename seed/sdk/{custom-auth/src/seed/resources/errors/types => basic-auth/src/seed/errors}/unauthorized_request_error_body.py (93%) delete mode 100644 seed/sdk/basic-auth/src/seed/resources/__init__.py delete mode 100644 seed/sdk/basic-auth/src/seed/resources/errors/__init__.py delete mode 100644 seed/sdk/basic-auth/src/seed/resources/errors/types/__init__.py delete mode 100644 seed/sdk/bearer-token-environment-variable/src/seed/resources/__init__.py rename seed/sdk/{bytes/src/seed/resources => bearer-token-environment-variable/src/seed}/service/__init__.py (100%) rename seed/sdk/bearer-token-environment-variable/src/seed/{resources/service/client.py => service/_client.py} (94%) delete mode 100644 seed/sdk/bytes/src/seed/resources/__init__.py rename seed/sdk/{custom-auth/src/seed/resources/custom_auth => bytes/src/seed/service}/__init__.py (100%) rename seed/sdk/bytes/src/seed/{resources/service/client.py => service/_client.py} (94%) rename seed/sdk/circular-references/src/seed/{resources/a/types => a}/__init__.py (100%) rename seed/sdk/circular-references/src/seed/{resources/a/types => a}/a.py (88%) rename seed/sdk/circular-references/src/seed/{resources/ast/types => ast}/__init__.py (100%) rename seed/sdk/circular-references/src/seed/{resources/ast/types => ast}/container_value.py (100%) rename seed/sdk/circular-references/src/seed/{resources/ast/types => ast}/field_value.py (100%) rename seed/sdk/circular-references/src/seed/{resources/ast/types => ast}/object_value.py (93%) rename seed/sdk/circular-references/src/seed/{resources/ast/types => ast}/primitive_value.py (100%) rename seed/sdk/circular-references/src/seed/{types => }/importing_a.py (90%) delete mode 100644 seed/sdk/circular-references/src/seed/resources/__init__.py delete mode 100644 seed/sdk/circular-references/src/seed/resources/ast/__init__.py rename seed/sdk/circular-references/src/seed/{types => }/root_type.py (93%) delete mode 100644 seed/sdk/circular-references/src/seed/types/__init__.py rename seed/sdk/{error-property/src/seed/resources/property_based_error => custom-auth/src/seed/custom_auth}/__init__.py (100%) rename seed/sdk/custom-auth/src/seed/{resources/custom_auth/client.py => custom_auth/_client.py} (92%) rename seed/sdk/custom-auth/src/seed/{resources/errors => }/errors/__init__.py (50%) rename seed/sdk/{basic-auth/src/seed/resources/errors => custom-auth/src/seed}/errors/bad_request.py (80%) rename seed/sdk/custom-auth/src/seed/{resources/errors => }/errors/unauthorized_request.py (64%) rename seed/sdk/{basic-auth/src/seed/resources/errors/types => custom-auth/src/seed/errors}/unauthorized_request_error_body.py (93%) delete mode 100644 seed/sdk/custom-auth/src/seed/resources/__init__.py delete mode 100644 seed/sdk/custom-auth/src/seed/resources/errors/__init__.py delete mode 100644 seed/sdk/custom-auth/src/seed/resources/errors/types/__init__.py delete mode 100644 seed/sdk/enum-query-params/src/seed/resources/__init__.py delete mode 100644 seed/sdk/enum-query-params/src/seed/resources/svc/__init__.py rename seed/sdk/enum-query-params/src/seed/{resources/svc/types => svc}/__init__.py (100%) rename seed/sdk/enum-query-params/src/seed/{resources/svc/client.py => svc/_client.py} (91%) rename seed/sdk/enum-query-params/src/seed/{resources/svc/types => svc}/my_enum.py (100%) rename seed/{fastapi/error-property/resources => sdk/error-property/src/seed/errors}/__init__.py (51%) rename seed/sdk/error-property/src/seed/{resources/errors => }/errors/property_based_error_test.py (64%) rename seed/sdk/error-property/src/seed/{resources/errors/types => errors}/property_based_error_test_body.py (93%) rename seed/sdk/{examples/src/seed/resources/file/resources/notification/resources/service => error-property/src/seed/property_based_error}/__init__.py (100%) rename seed/sdk/error-property/src/seed/{resources/property_based_error/client.py => property_based_error/_client.py} (90%) delete mode 100644 seed/sdk/error-property/src/seed/resources/__init__.py delete mode 100644 seed/sdk/error-property/src/seed/resources/errors/__init__.py delete mode 100644 seed/sdk/error-property/src/seed/resources/errors/errors/__init__.py delete mode 100644 seed/sdk/error-property/src/seed/resources/errors/types/__init__.py rename seed/sdk/examples/src/seed/{resources/commons/resources => commons}/__init__.py (100%) rename seed/sdk/examples/src/seed/{resources/commons/resources/types => commons}/types/__init__.py (100%) rename seed/sdk/examples/src/seed/{resources/commons/resources/types => commons}/types/data.py (93%) rename seed/sdk/examples/src/seed/{resources/commons/resources/types => commons}/types/event_info.py (94%) rename seed/sdk/examples/src/seed/{resources/commons/resources/types => commons}/types/metadata.py (91%) rename seed/sdk/examples/src/seed/{resources/commons/resources/types => commons}/types/tag.py (100%) rename seed/sdk/examples/src/seed/{resources/file/resources => file}/__init__.py (100%) rename seed/sdk/examples/src/seed/{resources/file/client.py => file/_client.py} (73%) rename seed/sdk/{api-wide-base-path/src/seed/resources => examples/src/seed/file/notification}/__init__.py (100%) rename seed/sdk/examples/src/seed/{resources/health/client.py => file/notification/_client.py} (81%) rename seed/sdk/examples/src/seed/{resources/health/resources => file/notification}/service/__init__.py (100%) rename seed/sdk/examples/src/seed/{resources/file/resources/notification/resources/service/client.py => file/notification/service/_client.py} (94%) rename seed/sdk/examples/src/seed/{resources/file/resources/service/types => file/service}/__init__.py (100%) rename seed/sdk/examples/src/seed/{resources/file/resources/service/client.py => file/service/_client.py} (92%) rename seed/sdk/examples/src/seed/{resources/file/resources/service/types => file/service}/filename.py (100%) rename seed/sdk/{auth-environment-variables/src/seed/resources => examples/src/seed/health}/__init__.py (100%) rename seed/sdk/examples/src/seed/{resources/file/resources/notification/client.py => health/_client.py} (68%) rename seed/sdk/examples/src/seed/{resources => health}/service/__init__.py (100%) rename seed/sdk/examples/src/seed/{resources/health/resources/service/client.py => health/service/_client.py} (97%) delete mode 100644 seed/sdk/examples/src/seed/resources/__init__.py delete mode 100644 seed/sdk/examples/src/seed/resources/commons/__init__.py delete mode 100644 seed/sdk/examples/src/seed/resources/commons/resources/types/__init__.py delete mode 100644 seed/sdk/examples/src/seed/resources/file/__init__.py delete mode 100644 seed/sdk/examples/src/seed/resources/file/resources/notification/__init__.py delete mode 100644 seed/sdk/examples/src/seed/resources/file/resources/notification/resources/__init__.py delete mode 100644 seed/sdk/examples/src/seed/resources/file/resources/service/__init__.py delete mode 100644 seed/sdk/examples/src/seed/resources/health/__init__.py delete mode 100644 seed/sdk/examples/src/seed/resources/health/resources/__init__.py delete mode 100644 seed/sdk/examples/src/seed/resources/types/__init__.py rename seed/sdk/{exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/container => examples/src/seed/service}/__init__.py (100%) rename seed/sdk/examples/src/seed/{resources/service/client.py => service/_client.py} (96%) rename seed/sdk/examples/src/seed/{resources/types => }/types/__init__.py (95%) rename seed/sdk/examples/src/seed/{resources/types => }/types/actor.py (93%) rename seed/sdk/examples/src/seed/{resources/types => }/types/actress.py (94%) rename seed/sdk/examples/src/seed/{resources/types => }/types/cast_member.py (100%) rename seed/sdk/examples/src/seed/{resources/types => }/types/directory.py (96%) rename seed/sdk/examples/src/seed/{resources/types => }/types/exception.py (100%) rename seed/sdk/examples/src/seed/{resources/types => }/types/exception_info.py (95%) rename seed/sdk/examples/src/seed/{resources/types => }/types/extended_movie.py (95%) rename seed/sdk/examples/src/seed/{resources/types => }/types/file.py (94%) rename seed/sdk/examples/src/seed/{resources/types => }/types/metadata.py (96%) rename seed/sdk/examples/src/seed/{resources/types => }/types/migration.py (94%) rename seed/sdk/examples/src/seed/{resources/types => }/types/migration_status.py (100%) rename seed/sdk/examples/src/seed/{resources/types => }/types/moment.py (95%) rename seed/sdk/examples/src/seed/{resources/types => }/types/movie.py (92%) rename seed/sdk/examples/src/seed/{resources/types => }/types/movie_id.py (100%) rename seed/sdk/examples/src/seed/{resources/types => }/types/node.py (96%) rename seed/sdk/examples/src/seed/{resources/types/errors => types}/not_found_error.py (82%) rename seed/sdk/examples/src/seed/{resources/types => }/types/request.py (94%) rename seed/sdk/examples/src/seed/{resources/types => }/types/response.py (94%) rename seed/sdk/examples/src/seed/{resources/types => }/types/stunt_double.py (94%) rename seed/sdk/examples/src/seed/{resources/types => }/types/test.py (100%) rename seed/sdk/examples/src/seed/{resources/types => }/types/tree.py (95%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/endpoints/resources => endpoints}/__init__.py (100%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/endpoints/client.py => extra_dependencies/src/seed/endpoints/_client.py} (71%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/endpoints/resources/enum => endpoints/container}/__init__.py (100%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/endpoints/resources/container/client.py => endpoints/container/_client.py} (98%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/endpoints/resources/http_methods => endpoints/enum}/__init__.py (100%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/endpoints/resources/enum/client.py => endpoints/enum/_client.py} (90%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/endpoints/resources/object => endpoints/http_methods}/__init__.py (100%) rename seed/sdk/exhaustive/{union-utils/src/seed/resources/endpoints/resources/http_methods/client.py => extra_dependencies/src/seed/endpoints/http_methods/_client.py} (96%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/endpoints/resources/params => endpoints/object}/__init__.py (100%) rename seed/sdk/exhaustive/{pydantic-v1/src/seed/resources/endpoints/resources/object/client.py => extra_dependencies/src/seed/endpoints/object/_client.py} (94%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/endpoints/resources/primitive => endpoints/params}/__init__.py (100%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/endpoints/resources/params/client.py => extra_dependencies/src/seed/endpoints/params/_client.py} (97%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/endpoints/resources/union => endpoints/primitive}/__init__.py (100%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/endpoints/resources/primitive/client.py => extra_dependencies/src/seed/endpoints/primitive/_client.py} (98%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/inlined_requests => endpoints/union}/__init__.py (100%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/endpoints/resources/union/client.py => extra_dependencies/src/seed/endpoints/union/_client.py} (90%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/general_errors/types => extra_dependencies/src/seed/general_errors}/__init__.py (55%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/general_errors/types => general_errors}/bad_object_request_info.py (93%) rename seed/sdk/exhaustive/{five-second-timeout/src/seed/resources/general_errors/errors => extra_dependencies/src/seed/general_errors}/bad_request_body.py (66%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/no_auth => inlined_requests}/__init__.py (100%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/inlined_requests/client.py => extra_dependencies/src/seed/inlined_requests/_client.py} (88%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/no_req_body => no_auth}/__init__.py (100%) rename seed/sdk/exhaustive/{union-utils/src/seed/resources/no_auth/client.py => extra_dependencies/src/seed/no_auth/_client.py} (89%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/req_with_headers => no_req_body}/__init__.py (100%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/no_req_body/client.py => extra_dependencies/src/seed/no_req_body/_client.py} (94%) rename seed/sdk/exhaustive/{five-second-timeout/src/seed/resources/endpoints/resources/container => extra_dependencies/src/seed/req_with_headers}/__init__.py (100%) rename seed/sdk/exhaustive/{union-utils/src/seed/resources/req_with_headers/client.py => extra_dependencies/src/seed/req_with_headers/_client.py} (92%) delete mode 100644 seed/sdk/exhaustive/extra_dependencies/src/seed/resources/__init__.py delete mode 100644 seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/__init__.py delete mode 100644 seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/__init__.py delete mode 100644 seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/__init__.py delete mode 100644 seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/__init__.py delete mode 100644 seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/types/__init__.py delete mode 100644 seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/__init__.py delete mode 100644 seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/__init__.py delete mode 100644 seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/errors/__init__.py rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/types/resources => types}/__init__.py (100%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/types/resources/enum/errors => extra_dependencies/src/seed/types/enum}/__init__.py (56%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/types/resources/enum/errors => extra_dependencies/src/seed/types/enum}/error_with_enum_body.py (68%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/types/resources/enum/types => types/enum}/weather_report.py (100%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/types/resources/object/types => extra_dependencies/src/seed/types/object}/__init__.py (54%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/types/resources/object/types => types/object}/nested_object_with_optional_field.py (94%) rename seed/sdk/exhaustive/{five-second-timeout/src/seed/resources/types/resources/object/errors => extra_dependencies/src/seed/types/object}/nested_object_with_optional_field_error.py (64%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/types/resources/object/types => extra_dependencies/src/seed/types/object}/nested_object_with_required_field.py (94%) rename seed/sdk/exhaustive/{five-second-timeout/src/seed/resources/types/resources/object/errors => extra_dependencies/src/seed/types/object}/nested_object_with_required_field_error.py (64%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/types/resources/object/types => extra_dependencies/src/seed/types/object}/object_with_map_of_map.py (93%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/types/resources/object/types => types/object}/object_with_optional_field.py (95%) rename seed/sdk/exhaustive/{five-second-timeout/src/seed/resources/types/resources/object/errors => extra_dependencies/src/seed/types/object}/object_with_optional_field_error.py (66%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/types/resources/object/types => extra_dependencies/src/seed/types/object}/object_with_required_field.py (93%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/types/resources/object/errors => types/object}/object_with_required_field_error.py (66%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/types/resources/union/types => extra_dependencies/src/seed/types/union}/__init__.py (53%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/types/resources/union/types => types/union}/animal.py (100%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/types/resources/union/types => extra_dependencies/src/seed/types/union}/cat.py (94%) rename seed/sdk/exhaustive/extra_dependencies/src/seed/{resources/types/resources/union/types => types/union}/dog.py (94%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/types/resources/union/errors => extra_dependencies/src/seed/types/union}/error_with_union_body.py (71%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/endpoints/resources => endpoints}/__init__.py (100%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/endpoints/client.py => five-second-timeout/src/seed/endpoints/_client.py} (71%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/endpoints/resources/enum => endpoints/container}/__init__.py (100%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/endpoints/resources/container/client.py => endpoints/container/_client.py} (98%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/endpoints/resources/http_methods => endpoints/enum}/__init__.py (100%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/endpoints/resources/enum/client.py => endpoints/enum/_client.py} (90%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/endpoints/resources/object => endpoints/http_methods}/__init__.py (100%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/endpoints/resources/http_methods/client.py => endpoints/http_methods/_client.py} (96%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/endpoints/resources/params => endpoints/object}/__init__.py (100%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/endpoints/resources/object/client.py => endpoints/object/_client.py} (94%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/endpoints/resources/primitive => endpoints/params}/__init__.py (100%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/endpoints/resources/params/client.py => endpoints/params/_client.py} (97%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/endpoints/resources/union => endpoints/primitive}/__init__.py (100%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/endpoints/resources/primitive/client.py => endpoints/primitive/_client.py} (98%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/inlined_requests => endpoints/union}/__init__.py (100%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/endpoints/resources/union/client.py => endpoints/union/_client.py} (90%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/general_errors/types => general_errors}/__init__.py (55%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/general_errors/types => general_errors}/bad_object_request_info.py (93%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/general_errors/errors => five-second-timeout/src/seed/general_errors}/bad_request_body.py (66%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/no_auth => inlined_requests}/__init__.py (100%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/inlined_requests/client.py => inlined_requests/_client.py} (88%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/no_req_body => no_auth}/__init__.py (100%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/no_auth/client.py => no_auth/_client.py} (89%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/req_with_headers => no_req_body}/__init__.py (100%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/no_req_body/client.py => no_req_body/_client.py} (94%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/endpoints/resources/container => five-second-timeout/src/seed/req_with_headers}/__init__.py (100%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/req_with_headers/client.py => req_with_headers/_client.py} (92%) delete mode 100644 seed/sdk/exhaustive/five-second-timeout/src/seed/resources/__init__.py delete mode 100644 seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/__init__.py delete mode 100644 seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/__init__.py delete mode 100644 seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/__init__.py delete mode 100644 seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/__init__.py delete mode 100644 seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/types/__init__.py delete mode 100644 seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/__init__.py delete mode 100644 seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/__init__.py delete mode 100644 seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/errors/__init__.py rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/types/resources => types}/__init__.py (100%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/types/resources/enum/errors => five-second-timeout/src/seed/types/enum}/__init__.py (56%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/types/resources/enum/errors => types/enum}/error_with_enum_body.py (68%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/types/resources/enum/types => types/enum}/weather_report.py (100%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/types/resources/object/types => five-second-timeout/src/seed/types/object}/__init__.py (54%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/types/resources/object/types => types/object}/nested_object_with_optional_field.py (94%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/types/resources/object/errors => five-second-timeout/src/seed/types/object}/nested_object_with_optional_field_error.py (64%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/types/resources/object/types => types/object}/nested_object_with_required_field.py (94%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/types/resources/object/errors => five-second-timeout/src/seed/types/object}/nested_object_with_required_field_error.py (64%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/types/resources/object/types => five-second-timeout/src/seed/types/object}/object_with_map_of_map.py (93%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/types/resources/object/types => five-second-timeout/src/seed/types/object}/object_with_optional_field.py (95%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/types/resources/object/errors => five-second-timeout/src/seed/types/object}/object_with_optional_field_error.py (66%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/types/resources/object/types => types/object}/object_with_required_field.py (93%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/types/resources/object/errors => types/object}/object_with_required_field_error.py (66%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/types/resources/union/types => types/union}/__init__.py (53%) rename seed/sdk/exhaustive/five-second-timeout/src/seed/{resources/types/resources/union/types => types/union}/animal.py (100%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/types/resources/union/types => five-second-timeout/src/seed/types/union}/cat.py (94%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/types/resources/union/types => five-second-timeout/src/seed/types/union}/dog.py (94%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/types/resources/union/errors => five-second-timeout/src/seed/types/union}/error_with_union_body.py (71%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/endpoints/resources => endpoints}/__init__.py (100%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/endpoints/client.py => infinite-timeout/src/seed/endpoints/_client.py} (71%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/endpoints/resources/enum => endpoints/container}/__init__.py (100%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/endpoints/resources/container/client.py => endpoints/container/_client.py} (98%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/endpoints/resources/http_methods => endpoints/enum}/__init__.py (100%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/endpoints/resources/enum/client.py => endpoints/enum/_client.py} (90%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/endpoints/resources/object => endpoints/http_methods}/__init__.py (100%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/endpoints/resources/http_methods/client.py => endpoints/http_methods/_client.py} (96%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/endpoints/resources/params => endpoints/object}/__init__.py (100%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/endpoints/resources/object/client.py => endpoints/object/_client.py} (94%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/endpoints/resources/primitive => endpoints/params}/__init__.py (100%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/endpoints/resources/params/client.py => endpoints/params/_client.py} (97%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/endpoints/resources/union => endpoints/primitive}/__init__.py (100%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/endpoints/resources/primitive/client.py => endpoints/primitive/_client.py} (98%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/inlined_requests => endpoints/union}/__init__.py (100%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/endpoints/resources/union/client.py => endpoints/union/_client.py} (90%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/general_errors/types => infinite-timeout/src/seed/general_errors}/__init__.py (55%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/general_errors/types => infinite-timeout/src/seed/general_errors}/bad_object_request_info.py (93%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/general_errors/errors => general_errors}/bad_request_body.py (66%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/no_auth => inlined_requests}/__init__.py (100%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/inlined_requests/client.py => inlined_requests/_client.py} (88%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/no_req_body => no_auth}/__init__.py (100%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/no_auth/client.py => no_auth/_client.py} (89%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/req_with_headers => no_req_body}/__init__.py (100%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/no_req_body/client.py => no_req_body/_client.py} (94%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/endpoints/resources/container => infinite-timeout/src/seed/req_with_headers}/__init__.py (100%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/req_with_headers/client.py => req_with_headers/_client.py} (92%) delete mode 100644 seed/sdk/exhaustive/infinite-timeout/src/seed/resources/__init__.py delete mode 100644 seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/__init__.py delete mode 100644 seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/__init__.py delete mode 100644 seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/__init__.py delete mode 100644 seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/__init__.py delete mode 100644 seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/types/__init__.py delete mode 100644 seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/__init__.py delete mode 100644 seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/__init__.py delete mode 100644 seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/errors/__init__.py rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/types/resources => types}/__init__.py (100%) rename seed/sdk/exhaustive/{five-second-timeout/src/seed/resources/types/resources/enum/errors => infinite-timeout/src/seed/types/enum}/__init__.py (56%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/types/resources/enum/errors => infinite-timeout/src/seed/types/enum}/error_with_enum_body.py (68%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/types/resources/enum/types => types/enum}/weather_report.py (100%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/types/resources/object/types => infinite-timeout/src/seed/types/object}/__init__.py (54%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/types/resources/object/types => types/object}/nested_object_with_optional_field.py (94%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/types/resources/object/errors => infinite-timeout/src/seed/types/object}/nested_object_with_optional_field_error.py (64%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/types/resources/object/types => infinite-timeout/src/seed/types/object}/nested_object_with_required_field.py (94%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/types/resources/object/errors => infinite-timeout/src/seed/types/object}/nested_object_with_required_field_error.py (64%) rename seed/sdk/exhaustive/{five-second-timeout/src/seed/resources/types/resources/object/types => infinite-timeout/src/seed/types/object}/object_with_map_of_map.py (93%) rename seed/sdk/exhaustive/{five-second-timeout/src/seed/resources/types/resources/object/types => infinite-timeout/src/seed/types/object}/object_with_optional_field.py (95%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/types/resources/object/errors => infinite-timeout/src/seed/types/object}/object_with_optional_field_error.py (66%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/types/resources/object/types => types/object}/object_with_required_field.py (93%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/types/resources/object/errors => types/object}/object_with_required_field_error.py (66%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/types/resources/union/types => infinite-timeout/src/seed/types/union}/__init__.py (53%) rename seed/sdk/exhaustive/infinite-timeout/src/seed/{resources/types/resources/union/types => types/union}/animal.py (100%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/types/resources/union/types => infinite-timeout/src/seed/types/union}/cat.py (94%) rename seed/sdk/exhaustive/{five-second-timeout/src/seed/resources/types/resources/union/types => infinite-timeout/src/seed/types/union}/dog.py (94%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/types/resources/union/errors => infinite-timeout/src/seed/types/union}/error_with_union_body.py (71%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/endpoints/resources => endpoints}/__init__.py (100%) rename seed/sdk/exhaustive/{five-second-timeout/src/seed/resources/endpoints/client.py => no-custom-config/src/seed/endpoints/_client.py} (71%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/endpoints/resources/enum => endpoints/container}/__init__.py (100%) rename seed/sdk/exhaustive/{pydantic-v1/src/seed/resources/endpoints/resources/container/client.py => no-custom-config/src/seed/endpoints/container/_client.py} (98%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/endpoints/resources/http_methods => endpoints/enum}/__init__.py (100%) rename seed/sdk/exhaustive/{union-utils/src/seed/resources/endpoints/resources/enum/client.py => no-custom-config/src/seed/endpoints/enum/_client.py} (90%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/endpoints/resources/object => endpoints/http_methods}/__init__.py (100%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/endpoints/resources/http_methods/client.py => no-custom-config/src/seed/endpoints/http_methods/_client.py} (96%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/endpoints/resources/params => endpoints/object}/__init__.py (100%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/endpoints/resources/object/client.py => endpoints/object/_client.py} (94%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/endpoints/resources/primitive => endpoints/params}/__init__.py (100%) rename seed/sdk/exhaustive/{union-utils/src/seed/resources/endpoints/resources/params/client.py => no-custom-config/src/seed/endpoints/params/_client.py} (97%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/endpoints/resources/union => endpoints/primitive}/__init__.py (100%) rename seed/sdk/exhaustive/{union-utils/src/seed/resources/endpoints/resources/primitive/client.py => no-custom-config/src/seed/endpoints/primitive/_client.py} (98%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/inlined_requests => endpoints/union}/__init__.py (100%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/endpoints/resources/union/client.py => no-custom-config/src/seed/endpoints/union/_client.py} (90%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/general_errors/types => general_errors}/__init__.py (55%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/general_errors/types => no-custom-config/src/seed/general_errors}/bad_object_request_info.py (93%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/general_errors/errors => general_errors}/bad_request_body.py (66%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/no_auth => inlined_requests}/__init__.py (100%) rename seed/sdk/exhaustive/{pydantic-v1/src/seed/resources/inlined_requests/client.py => no-custom-config/src/seed/inlined_requests/_client.py} (88%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/no_req_body => no_auth}/__init__.py (100%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/no_auth/client.py => no-custom-config/src/seed/no_auth/_client.py} (89%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/req_with_headers => no_req_body}/__init__.py (100%) rename seed/sdk/exhaustive/{pydantic-v1/src/seed/resources/no_req_body/client.py => no-custom-config/src/seed/no_req_body/_client.py} (94%) rename seed/sdk/exhaustive/{pydantic-v1/src/seed/resources/endpoints/resources/container => no-custom-config/src/seed/req_with_headers}/__init__.py (100%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/req_with_headers/client.py => req_with_headers/_client.py} (92%) delete mode 100644 seed/sdk/exhaustive/no-custom-config/src/seed/resources/__init__.py delete mode 100644 seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/__init__.py delete mode 100644 seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/__init__.py delete mode 100644 seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/__init__.py delete mode 100644 seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/__init__.py delete mode 100644 seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/types/__init__.py delete mode 100644 seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/__init__.py delete mode 100644 seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/__init__.py delete mode 100644 seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/errors/__init__.py rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/types/resources => types}/__init__.py (100%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/types/resources/enum/errors => types/enum}/__init__.py (56%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/types/resources/enum/errors => types/enum}/error_with_enum_body.py (68%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/types/resources/enum/types => types/enum}/weather_report.py (100%) rename seed/sdk/exhaustive/{five-second-timeout/src/seed/resources/types/resources/object/types => no-custom-config/src/seed/types/object}/__init__.py (54%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/types/resources/object/types => types/object}/nested_object_with_optional_field.py (94%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/types/resources/object/errors => no-custom-config/src/seed/types/object}/nested_object_with_optional_field_error.py (64%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/types/resources/object/types => no-custom-config/src/seed/types/object}/nested_object_with_required_field.py (94%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/types/resources/object/errors => no-custom-config/src/seed/types/object}/nested_object_with_required_field_error.py (64%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/types/resources/object/types => no-custom-config/src/seed/types/object}/object_with_map_of_map.py (93%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/types/resources/object/types => no-custom-config/src/seed/types/object}/object_with_optional_field.py (95%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/types/resources/object/errors => no-custom-config/src/seed/types/object}/object_with_optional_field_error.py (66%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/types/resources/object/types => no-custom-config/src/seed/types/object}/object_with_required_field.py (93%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/types/resources/object/errors => types/object}/object_with_required_field_error.py (66%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/types/resources/union/types => types/union}/__init__.py (53%) rename seed/sdk/exhaustive/no-custom-config/src/seed/{resources/types/resources/union/types => types/union}/animal.py (100%) rename seed/sdk/exhaustive/{five-second-timeout/src/seed/resources/types/resources/union/types => no-custom-config/src/seed/types/union}/cat.py (94%) rename seed/sdk/exhaustive/{infinite-timeout/src/seed/resources/types/resources/union/types => no-custom-config/src/seed/types/union}/dog.py (94%) rename seed/sdk/exhaustive/{five-second-timeout/src/seed/resources/types/resources/union/errors => no-custom-config/src/seed/types/union}/error_with_union_body.py (71%) rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/endpoints/resources => endpoints}/__init__.py (100%) create mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/_client.py rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/endpoints/resources/enum => endpoints/container}/__init__.py (100%) rename seed/sdk/exhaustive/{union-utils/src/seed/resources/endpoints/resources/container/client.py => pydantic-v1/src/seed/endpoints/container/_client.py} (98%) rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/endpoints/resources/http_methods => endpoints/enum}/__init__.py (100%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/endpoints/resources/enum/client.py => pydantic-v1/src/seed/endpoints/enum/_client.py} (90%) rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/endpoints/resources/object => endpoints/http_methods}/__init__.py (100%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/endpoints/resources/http_methods/client.py => pydantic-v1/src/seed/endpoints/http_methods/_client.py} (96%) rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/endpoints/resources/params => endpoints/object}/__init__.py (100%) rename seed/sdk/exhaustive/{union-utils/src/seed/resources/endpoints/resources/object/client.py => pydantic-v1/src/seed/endpoints/object/_client.py} (94%) rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/endpoints/resources/primitive => endpoints/params}/__init__.py (100%) rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/endpoints/resources/params/client.py => endpoints/params/_client.py} (97%) rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/endpoints/resources/union => endpoints/primitive}/__init__.py (100%) rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/endpoints/resources/primitive/client.py => endpoints/primitive/_client.py} (98%) rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/inlined_requests => endpoints/union}/__init__.py (100%) rename seed/sdk/exhaustive/{union-utils/src/seed/resources/endpoints/resources/union/client.py => pydantic-v1/src/seed/endpoints/union/_client.py} (90%) create mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/general_errors/__init__.py rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/general_errors/types => general_errors}/bad_object_request_info.py (93%) create mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/general_errors/bad_request_body.py rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/no_auth => inlined_requests}/__init__.py (100%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/inlined_requests/client.py => pydantic-v1/src/seed/inlined_requests/_client.py} (88%) rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/no_req_body => no_auth}/__init__.py (100%) rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/no_auth/client.py => no_auth/_client.py} (89%) rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/req_with_headers => no_req_body}/__init__.py (100%) rename seed/sdk/exhaustive/{union-utils/src/seed/resources/no_req_body/client.py => pydantic-v1/src/seed/no_req_body/_client.py} (94%) rename seed/sdk/exhaustive/{union-utils/src/seed/resources/endpoints/resources/container => pydantic-v1/src/seed/req_with_headers}/__init__.py (100%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/req_with_headers/client.py => pydantic-v1/src/seed/req_with_headers/_client.py} (92%) delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/__init__.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/__init__.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/client.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/__init__.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/errors/bad_request_body.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/types/__init__.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/__init__.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/__init__.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/types/__init__.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/__init__.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/__init__.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/__init__.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/errors/error_with_union_body.py delete mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/types/__init__.py rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/types/resources => types}/__init__.py (100%) create mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/types/enum/__init__.py create mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/types/enum/error_with_enum_body.py rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/types/resources/enum/types => types/enum}/weather_report.py (100%) create mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/__init__.py rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/types/resources/object/types => types/object}/nested_object_with_optional_field.py (94%) create mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/nested_object_with_optional_field_error.py rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/types/resources/object/types => types/object}/nested_object_with_required_field.py (94%) create mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/nested_object_with_required_field_error.py rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/types/resources/object/types => types/object}/object_with_map_of_map.py (93%) rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/types/resources/object/types => types/object}/object_with_optional_field.py (95%) create mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_optional_field_error.py rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/types/resources/object/types => types/object}/object_with_required_field.py (92%) create mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_required_field_error.py create mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/__init__.py rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/types/resources/union/types => types/union}/animal.py (100%) rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/types/resources/union/types => types/union}/cat.py (93%) rename seed/sdk/exhaustive/pydantic-v1/src/seed/{resources/types/resources/union/types => types/union}/dog.py (93%) create mode 100644 seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/error_with_union_body.py rename seed/sdk/exhaustive/union-utils/src/seed/{resources/endpoints/resources => endpoints}/__init__.py (100%) create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/endpoints/_client.py rename seed/sdk/exhaustive/union-utils/src/seed/{resources/endpoints/resources/enum => endpoints/container}/__init__.py (100%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/endpoints/resources/container/client.py => union-utils/src/seed/endpoints/container/_client.py} (98%) rename seed/sdk/exhaustive/union-utils/src/seed/{resources/endpoints/resources/http_methods => endpoints/enum}/__init__.py (100%) rename seed/sdk/exhaustive/{pydantic-v1/src/seed/resources/endpoints/resources/enum/client.py => union-utils/src/seed/endpoints/enum/_client.py} (90%) rename seed/sdk/exhaustive/union-utils/src/seed/{resources/endpoints/resources/object => endpoints/http_methods}/__init__.py (100%) rename seed/sdk/exhaustive/{pydantic-v1/src/seed/resources/endpoints/resources/http_methods/client.py => union-utils/src/seed/endpoints/http_methods/_client.py} (96%) rename seed/sdk/exhaustive/union-utils/src/seed/{resources/endpoints/resources/params => endpoints/object}/__init__.py (100%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/endpoints/resources/object/client.py => union-utils/src/seed/endpoints/object/_client.py} (94%) rename seed/sdk/exhaustive/union-utils/src/seed/{resources/endpoints/resources/primitive => endpoints/params}/__init__.py (100%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/endpoints/resources/params/client.py => union-utils/src/seed/endpoints/params/_client.py} (97%) rename seed/sdk/exhaustive/union-utils/src/seed/{resources/endpoints/resources/union => endpoints/primitive}/__init__.py (100%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/endpoints/resources/primitive/client.py => union-utils/src/seed/endpoints/primitive/_client.py} (98%) rename seed/sdk/exhaustive/union-utils/src/seed/{resources/inlined_requests => endpoints/union}/__init__.py (100%) rename seed/sdk/exhaustive/{pydantic-v1/src/seed/resources/endpoints/resources/union/client.py => union-utils/src/seed/endpoints/union/_client.py} (90%) create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/general_errors/__init__.py create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/general_errors/bad_object_request_info.py create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/general_errors/bad_request_body.py rename seed/sdk/exhaustive/union-utils/src/seed/{resources/no_auth => inlined_requests}/__init__.py (100%) rename seed/sdk/exhaustive/union-utils/src/seed/{resources/inlined_requests/client.py => inlined_requests/_client.py} (88%) rename seed/sdk/exhaustive/union-utils/src/seed/{resources/no_req_body => no_auth}/__init__.py (100%) rename seed/sdk/exhaustive/{no-custom-config/src/seed/resources/no_auth/client.py => union-utils/src/seed/no_auth/_client.py} (89%) rename seed/sdk/exhaustive/union-utils/src/seed/{resources/req_with_headers => no_req_body}/__init__.py (100%) rename seed/sdk/exhaustive/{extra_dependencies/src/seed/resources/no_req_body/client.py => union-utils/src/seed/no_req_body/_client.py} (94%) rename seed/sdk/{file-download/src/seed/resources/service => exhaustive/union-utils/src/seed/req_with_headers}/__init__.py (100%) rename seed/sdk/exhaustive/{pydantic-v1/src/seed/resources/req_with_headers/client.py => union-utils/src/seed/req_with_headers/_client.py} (92%) delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/__init__.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/__init__.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/client.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/__init__.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/errors/bad_request_body.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/types/__init__.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/types/bad_object_request_info.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/__init__.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/__init__.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/types/__init__.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/__init__.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/__init__.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/object_with_map_of_map.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/object_with_optional_field.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/object_with_required_field.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/__init__.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/errors/__init__.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/errors/error_with_union_body.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/types/cat.py delete mode 100644 seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/types/dog.py rename seed/sdk/exhaustive/union-utils/src/seed/{resources/types/resources => types}/__init__.py (100%) create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/types/enum/__init__.py create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/types/enum/error_with_enum_body.py rename seed/sdk/exhaustive/union-utils/src/seed/{resources/types/resources/enum/types => types/enum}/weather_report.py (100%) create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/types/object/__init__.py create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_optional_field.py create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_optional_field_error.py create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_required_field.py create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_required_field_error.py create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_map_of_map.py create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_optional_field.py create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_optional_field_error.py create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_required_field.py create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_required_field_error.py rename seed/sdk/exhaustive/union-utils/src/seed/{resources/types/resources/union/types => types/union}/__init__.py (54%) rename seed/sdk/exhaustive/union-utils/src/seed/{resources/types/resources/union/types => types/union}/animal.py (64%) create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/types/union/cat.py create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/types/union/dog.py create mode 100644 seed/sdk/exhaustive/union-utils/src/seed/types/union/error_with_union_body.py rename seed/sdk/extends/src/seed/{types => }/docs.py (94%) rename seed/sdk/extends/src/seed/{types => }/example_type.py (94%) rename seed/sdk/extends/src/seed/{types => }/json.py (94%) rename seed/sdk/extends/src/seed/{types => }/nested_type.py (94%) delete mode 100644 seed/sdk/extends/src/seed/types/__init__.py delete mode 100644 seed/sdk/file-download/src/seed/resources/__init__.py rename seed/sdk/{folders/src/seed/resources/a/resources/b => file-download/src/seed/service}/__init__.py (100%) rename seed/sdk/file-download/src/seed/{resources/service/client.py => service/_client.py} (94%) delete mode 100644 seed/sdk/file-upload/src/seed/resources/__init__.py delete mode 100644 seed/sdk/file-upload/src/seed/resources/service/__init__.py rename seed/sdk/file-upload/src/seed/{resources/service/types => service}/__init__.py (100%) rename seed/sdk/file-upload/src/seed/{resources/service/client.py => service/_client.py} (96%) rename seed/sdk/file-upload/src/seed/{resources/service/types => service}/maybe_list.py (100%) rename seed/sdk/file-upload/src/seed/{resources/service/types => service}/maybe_list_or_set.py (100%) rename seed/sdk/file-upload/src/seed/{resources/service/types => service}/my_object.py (93%) rename seed/sdk/folders/src/seed/{resources/a/resources => a}/__init__.py (100%) rename seed/sdk/folders/src/seed/{resources/a/client.py => a/_client.py} (76%) rename seed/sdk/folders/src/seed/{resources/a/resources/c => a/b}/__init__.py (100%) rename seed/sdk/folders/src/seed/{resources/a/resources/b/client.py => a/b/_client.py} (92%) rename seed/sdk/{literal-headers/src/seed/resources/no_headers => folders/src/seed/a/c}/__init__.py (100%) rename seed/sdk/folders/src/seed/{resources/a/resources/c/client.py => a/c/_client.py} (92%) rename seed/sdk/folders/src/seed/{resources/a/resources/d/resources => a/d}/__init__.py (100%) rename seed/sdk/folders/src/seed/{resources/a/resources/d/resources/types => a/d}/types/__init__.py (100%) rename seed/sdk/folders/src/seed/{resources/a/resources/d/resources/types => a/d}/types/foo.py (100%) rename seed/sdk/folders/src/seed/{resources/folder/resources => folder}/__init__.py (100%) rename seed/sdk/folders/src/seed/{resources/folder/client.py => folder/_client.py} (89%) rename seed/sdk/{examples/src/seed/resources/types/errors => folders/src/seed/folder/service}/__init__.py (100%) rename seed/sdk/folders/src/seed/{resources/folder/resources/service/client.py => folder/service/_client.py} (94%) rename seed/sdk/folders/src/seed/{resources/folder/resources/service/errors => folder/service}/not_found_error.py (81%) delete mode 100644 seed/sdk/folders/src/seed/resources/__init__.py delete mode 100644 seed/sdk/folders/src/seed/resources/a/__init__.py delete mode 100644 seed/sdk/folders/src/seed/resources/a/resources/d/__init__.py delete mode 100644 seed/sdk/folders/src/seed/resources/a/resources/d/resources/types/__init__.py delete mode 100644 seed/sdk/folders/src/seed/resources/folder/__init__.py delete mode 100644 seed/sdk/folders/src/seed/resources/folder/resources/service/__init__.py delete mode 100644 seed/sdk/folders/src/seed/resources/folder/resources/service/errors/__init__.py rename seed/sdk/idempotency-headers/src/seed/{resources/payment/types => payment}/__init__.py (100%) rename seed/sdk/idempotency-headers/src/seed/{resources/payment/client.py => payment/_client.py} (94%) rename seed/sdk/idempotency-headers/src/seed/{resources/payment/types => payment}/currency.py (100%) delete mode 100644 seed/sdk/idempotency-headers/src/seed/resources/__init__.py delete mode 100644 seed/sdk/idempotency-headers/src/seed/resources/payment/__init__.py rename seed/sdk/imdb/src/seed/{resources/imdb/types => imdb}/__init__.py (55%) rename seed/sdk/imdb/src/seed/{resources/imdb/client.py => imdb/_client.py} (92%) rename seed/sdk/imdb/src/seed/{resources/imdb/types => imdb}/create_movie_request.py (93%) rename seed/sdk/imdb/src/seed/{resources/imdb/types => imdb}/movie.py (94%) rename seed/sdk/imdb/src/seed/{resources/imdb/errors => imdb}/movie_does_not_exist_error.py (72%) rename seed/sdk/imdb/src/seed/{resources/imdb/types => imdb}/movie_id.py (100%) delete mode 100644 seed/sdk/imdb/src/seed/resources/__init__.py delete mode 100644 seed/sdk/imdb/src/seed/resources/imdb/__init__.py delete mode 100644 seed/sdk/imdb/src/seed/resources/imdb/errors/__init__.py rename seed/sdk/literal-headers/src/seed/{resources/only_literal_headers => no_headers}/__init__.py (100%) rename seed/sdk/literal-headers/src/seed/{resources/no_headers/client.py => no_headers/_client.py} (93%) rename seed/sdk/literal-headers/src/seed/{resources/with_non_literal_headers => only_literal_headers}/__init__.py (100%) rename seed/sdk/literal-headers/src/seed/{resources/only_literal_headers/client.py => only_literal_headers/_client.py} (93%) delete mode 100644 seed/sdk/literal-headers/src/seed/resources/__init__.py rename seed/sdk/{multi-url-environment/src/seed/resources/ec_2 => literal-headers/src/seed/with_non_literal_headers}/__init__.py (100%) rename seed/sdk/literal-headers/src/seed/{resources/with_non_literal_headers/client.py => with_non_literal_headers/_client.py} (95%) rename seed/sdk/literal/src/seed/{resources/literal/types => literal}/__init__.py (100%) rename seed/sdk/literal/src/seed/{resources/literal/client.py => literal/_client.py} (94%) rename seed/sdk/literal/src/seed/{resources/literal/types => literal}/create_options_response.py (100%) rename seed/sdk/literal/src/seed/{resources/literal/types => literal}/options.py (94%) rename seed/sdk/literal/src/seed/{resources/literal/types => literal}/undiscriminated_options.py (100%) delete mode 100644 seed/sdk/literal/src/seed/resources/__init__.py delete mode 100644 seed/sdk/literal/src/seed/resources/literal/__init__.py rename seed/sdk/multi-url-environment/src/seed/{resources/s_3 => ec_2}/__init__.py (100%) rename seed/sdk/multi-url-environment/src/seed/{resources/ec_2/client.py => ec_2/_client.py} (92%) delete mode 100644 seed/sdk/multi-url-environment/src/seed/resources/__init__.py rename seed/sdk/{no-environment/src/seed/resources/dummy => multi-url-environment/src/seed/s_3}/__init__.py (100%) rename seed/sdk/multi-url-environment/src/seed/{resources/s_3/client.py => s_3/_client.py} (93%) rename seed/sdk/{package-yml/src/seed/resources/service => no-environment/src/seed/dummy}/__init__.py (100%) rename seed/sdk/{single-url-environment-default/src/seed/resources/dummy/client.py => no-environment/src/seed/dummy/_client.py} (94%) rename seed/sdk/object/src/seed/{types => }/name.py (94%) rename seed/sdk/object/src/seed/{types => }/type.py (97%) delete mode 100644 seed/sdk/object/src/seed/types/__init__.py rename seed/sdk/objects-with-imports/src/seed/{resources/commons/resources => commons}/__init__.py (100%) rename seed/sdk/objects-with-imports/src/seed/{resources/commons/resources/metadata/types => commons/metadata}/__init__.py (100%) rename seed/sdk/objects-with-imports/src/seed/{resources/commons/resources/metadata/types => commons/metadata}/metadata.py (90%) rename seed/{fastapi/objects-with-imports/resources/file/resources => sdk/objects-with-imports/src/seed/file}/__init__.py (52%) rename seed/sdk/objects-with-imports/src/seed/{resources/file/resources/directory/types => file/directory}/__init__.py (100%) rename seed/sdk/objects-with-imports/src/seed/{resources/file/resources/directory/types => file/directory}/directory.py (92%) rename seed/sdk/objects-with-imports/src/seed/{resources/file/types => file}/file.py (94%) rename seed/sdk/objects-with-imports/src/seed/{resources/file/types => file}/file_info.py (100%) rename seed/sdk/objects-with-imports/src/seed/{types => }/node.py (86%) delete mode 100644 seed/sdk/objects-with-imports/src/seed/resources/__init__.py delete mode 100644 seed/sdk/objects-with-imports/src/seed/resources/commons/__init__.py delete mode 100644 seed/sdk/objects-with-imports/src/seed/resources/commons/resources/metadata/__init__.py delete mode 100644 seed/sdk/objects-with-imports/src/seed/resources/file/__init__.py delete mode 100644 seed/sdk/objects-with-imports/src/seed/resources/file/resources/__init__.py delete mode 100644 seed/sdk/objects-with-imports/src/seed/resources/file/resources/directory/__init__.py delete mode 100644 seed/sdk/objects-with-imports/src/seed/resources/file/types/__init__.py rename seed/sdk/objects-with-imports/src/seed/{types => }/tree.py (93%) delete mode 100644 seed/sdk/objects-with-imports/src/seed/types/__init__.py create mode 100644 seed/sdk/optional/.github/workflows/ci.yml create mode 100644 seed/sdk/optional/.gitignore create mode 100644 seed/sdk/optional/README.md create mode 100644 seed/sdk/optional/poetry.lock create mode 100644 seed/sdk/optional/pyproject.toml create mode 100644 seed/sdk/optional/snippet.json rename seed/sdk/{audiences/src/seed/resources/folder_b/resources/common => optional/src/seed}/__init__.py (58%) create mode 100644 seed/sdk/optional/src/seed/client.py create mode 100644 seed/sdk/optional/src/seed/core/__init__.py create mode 100644 seed/sdk/optional/src/seed/core/api_error.py create mode 100644 seed/sdk/optional/src/seed/core/client_wrapper.py create mode 100644 seed/sdk/optional/src/seed/core/datetime_utils.py create mode 100644 seed/sdk/optional/src/seed/core/jsonable_encoder.py create mode 100644 seed/sdk/optional/src/seed/core/remove_none_from_dict.py rename seed/sdk/{plain-text/src/seed/resources/service => optional/src/seed/optional}/__init__.py (100%) create mode 100644 seed/sdk/optional/src/seed/optional/_client.py create mode 100644 seed/sdk/optional/src/seed/py.typed create mode 100644 seed/sdk/optional/tests/__init__.py create mode 100644 seed/sdk/optional/tests/test_client.py delete mode 100644 seed/sdk/package-yml/src/seed/resources/__init__.py rename seed/sdk/{single-url-environment-default/src/seed/resources/dummy => package-yml/src/seed/service}/__init__.py (100%) rename seed/sdk/package-yml/src/seed/{resources/service/client.py => service/_client.py} (95%) delete mode 100644 seed/sdk/plain-text/src/seed/resources/__init__.py rename seed/sdk/{single-url-environment-no-default/src/seed/resources/dummy => plain-text/src/seed/service}/__init__.py (100%) rename seed/sdk/plain-text/src/seed/{resources/service/client.py => service/_client.py} (93%) rename seed/sdk/reserved-keywords/src/seed/{resources/package/types => package}/__init__.py (100%) rename seed/sdk/reserved-keywords/src/seed/{resources/package/client.py => package/_client.py} (91%) rename seed/sdk/reserved-keywords/src/seed/{resources/package/types => package}/package.py (93%) rename seed/sdk/reserved-keywords/src/seed/{resources/package/types => package}/record.py (94%) delete mode 100644 seed/sdk/reserved-keywords/src/seed/resources/__init__.py delete mode 100644 seed/sdk/reserved-keywords/src/seed/resources/package/__init__.py rename seed/sdk/{trace/src/seed/resources/homepage => single-url-environment-default/src/seed/dummy}/__init__.py (100%) rename seed/sdk/{single-url-environment-no-default/src/seed/resources/dummy/client.py => single-url-environment-default/src/seed/dummy/_client.py} (94%) delete mode 100644 seed/sdk/single-url-environment-default/src/seed/resources/__init__.py rename seed/sdk/{trace/src/seed/resources/sysprop => single-url-environment-no-default/src/seed/dummy}/__init__.py (100%) rename seed/sdk/{no-environment/src/seed/resources/dummy/client.py => single-url-environment-no-default/src/seed/dummy/_client.py} (94%) delete mode 100644 seed/sdk/single-url-environment-no-default/src/seed/resources/__init__.py rename seed/sdk/streaming/src/seed/{resources/dummy/types => dummy}/__init__.py (100%) rename seed/sdk/streaming/src/seed/{resources/dummy/client.py => dummy/_client.py} (92%) rename seed/sdk/streaming/src/seed/{resources/dummy/types => dummy}/stream_response.py (93%) delete mode 100644 seed/sdk/streaming/src/seed/resources/__init__.py delete mode 100644 seed/sdk/streaming/src/seed/resources/dummy/__init__.py rename seed/sdk/trace/src/seed/{resources/admin/types => admin}/__init__.py (100%) rename seed/sdk/trace/src/seed/{resources/admin/client.py => admin/_client.py} (95%) rename seed/sdk/trace/src/seed/{resources/admin/types => admin}/test.py (100%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/__init__.py (100%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/binary_tree_node_and_tree_value.py (95%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/binary_tree_node_value.py (94%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/binary_tree_value.py (94%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/debug_key_value_pairs.py (94%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/debug_map_value.py (95%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/debug_variable_value.py (100%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/doubly_linked_list_node_and_list_value.py (95%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/doubly_linked_list_node_value.py (94%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/doubly_linked_list_value.py (94%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/file_info.py (93%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/generic_value.py (94%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/key_value_pair.py (94%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/language.py (100%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/list_type.py (95%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/map_type.py (95%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/map_value.py (95%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/node_id.py (100%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/problem_id.py (100%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/singly_linked_list_node_and_list_value.py (95%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/singly_linked_list_node_value.py (94%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/singly_linked_list_value.py (94%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/test_case.py (94%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/test_case_with_expected_result.py (95%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/user_id.py (100%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/variable_type.py (100%) rename seed/sdk/trace/src/seed/{resources/commons/types => commons}/variable_value.py (100%) rename seed/sdk/{variables/src/seed/resources/service => trace/src/seed/homepage}/__init__.py (100%) rename seed/sdk/trace/src/seed/{resources/homepage/client.py => homepage/_client.py} (94%) rename seed/sdk/trace/src/seed/{resources/lang_server/types => lang_server}/__init__.py (100%) rename seed/sdk/trace/src/seed/{resources/lang_server/types => lang_server}/lang_server_request.py (93%) rename seed/sdk/trace/src/seed/{resources/lang_server/types => lang_server}/lang_server_response.py (93%) rename seed/sdk/trace/src/seed/{resources/migration/types => migration}/__init__.py (100%) rename seed/sdk/trace/src/seed/{resources/migration/client.py => migration/_client.py} (91%) rename seed/sdk/trace/src/seed/{resources/migration/types => migration}/migration.py (94%) rename seed/sdk/trace/src/seed/{resources/migration/types => migration}/migration_status.py (100%) rename seed/sdk/trace/src/seed/{resources/playlist/types => playlist}/__init__.py (78%) rename seed/sdk/trace/src/seed/{resources/playlist/client.py => playlist/_client.py} (95%) rename seed/sdk/trace/src/seed/{resources/playlist/types => playlist}/playlist.py (91%) rename seed/sdk/trace/src/seed/{resources/playlist/types => playlist}/playlist_create_request.py (89%) rename seed/sdk/trace/src/seed/{resources/playlist/types => playlist}/playlist_id.py (100%) rename seed/sdk/trace/src/seed/{resources/playlist/errors => playlist}/playlist_id_not_found_error.py (64%) rename seed/sdk/trace/src/seed/{resources/playlist/types => playlist}/playlist_id_not_found_error_body.py (100%) rename seed/sdk/trace/src/seed/{resources/playlist/types => playlist}/reserved_keyword_enum.py (100%) rename seed/sdk/trace/src/seed/{resources/playlist/errors => playlist}/unauthorized_error.py (81%) rename seed/sdk/trace/src/seed/{resources/playlist/types => playlist}/update_playlist_request.py (89%) rename seed/sdk/trace/src/seed/{resources/problem/types => problem}/__init__.py (100%) rename seed/sdk/trace/src/seed/{resources/problem/client.py => problem/_client.py} (93%) rename seed/sdk/trace/src/seed/{resources/problem/types => problem}/create_problem_error.py (100%) rename seed/sdk/trace/src/seed/{resources/problem/types => problem}/create_problem_request.py (85%) rename seed/sdk/trace/src/seed/{resources/problem/types => problem}/create_problem_response.py (94%) rename seed/sdk/trace/src/seed/{resources/problem/types => problem}/generic_create_problem_error.py (94%) rename seed/sdk/trace/src/seed/{resources/problem/types => problem}/get_default_starter_files_response.py (89%) rename seed/sdk/trace/src/seed/{resources/problem/types => problem}/problem_description.py (94%) rename seed/sdk/trace/src/seed/{resources/problem/types => problem}/problem_description_board.py (93%) rename seed/sdk/trace/src/seed/{resources/problem/types => problem}/problem_files.py (90%) rename seed/sdk/trace/src/seed/{resources/problem/types => problem}/problem_info.py (85%) rename seed/sdk/trace/src/seed/{resources/problem/types => problem}/update_problem_response.py (94%) rename seed/sdk/trace/src/seed/{resources/problem/types => problem}/variable_type_and_name.py (89%) delete mode 100644 seed/sdk/trace/src/seed/resources/__init__.py delete mode 100644 seed/sdk/trace/src/seed/resources/admin/__init__.py delete mode 100644 seed/sdk/trace/src/seed/resources/commons/__init__.py delete mode 100644 seed/sdk/trace/src/seed/resources/lang_server/__init__.py delete mode 100644 seed/sdk/trace/src/seed/resources/migration/__init__.py delete mode 100644 seed/sdk/trace/src/seed/resources/playlist/__init__.py delete mode 100644 seed/sdk/trace/src/seed/resources/playlist/errors/__init__.py delete mode 100644 seed/sdk/trace/src/seed/resources/problem/__init__.py delete mode 100644 seed/sdk/trace/src/seed/resources/submission/__init__.py delete mode 100644 seed/sdk/trace/src/seed/resources/v_2/__init__.py delete mode 100644 seed/sdk/trace/src/seed/resources/v_2/resources/problem/__init__.py delete mode 100644 seed/sdk/trace/src/seed/resources/v_2/resources/v_3/__init__.py delete mode 100644 seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/__init__.py rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/__init__.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/client.py => submission/_client.py} (95%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/actual_result.py (93%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/building_executor_response.py (95%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/code_execution_update.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/compile_error.py (93%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/custom_test_cases_unsupported.py (90%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/error_info.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/errored_response.py (95%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/exception_info.py (95%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/exception_v_2.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/execution_session_response.py (91%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/execution_session_state.py (86%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/execution_session_status.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/existing_submission_executing.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/expression_location.py (93%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/finished_response.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/get_execution_session_state_response.py (95%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/get_submission_state_response.py (91%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/get_trace_responses_page_request.py (93%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/graded_response.py (95%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/graded_response_v_2.py (89%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/graded_test_case_update.py (89%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/initialize_problem_request.py (90%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/internal_error.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/invalid_request_cause.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/invalid_request_response.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/lightweight_stackframe_information.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/recorded_response_notification.py (95%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/recorded_test_case_update.py (89%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/recording_response_notification.py (96%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/running_response.py (95%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/running_submission_state.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/runtime_error.py (93%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/scope.py (87%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/share_id.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/stack_frame.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/stack_information.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/stderr_response.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/stdout_response.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/stop_request.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/stopped_response.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/submission_file_info.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/submission_id.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/submission_id_not_found.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/submission_request.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/submission_response.py (97%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/submission_status_for_test_case.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/submission_status_v_2.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/submission_type_enum.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/submission_type_state.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/submit_request_v_2.py (89%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/terminated_response.py (93%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/test_case_grade.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/test_case_hidden_grade.py (93%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/test_case_non_hidden_grade.py (90%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/test_case_result.py (90%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/test_case_result_with_stdout.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/test_submission_state.py (88%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/test_submission_status.py (72%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/test_submission_status_v_2.py (86%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/test_submission_update.py (95%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/test_submission_update_info.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/trace_response.py (91%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/trace_response_v_2.py (92%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/trace_responses_page.py (95%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/trace_responses_page_v_2.py (95%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/traced_file.py (93%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/traced_test_case.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/unexpected_language_error.py (90%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/workspace_files.py (90%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/workspace_ran_response.py (95%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/workspace_run_details.py (95%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/workspace_starter_files_response.py (89%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/workspace_starter_files_response_v_2.py (85%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/workspace_submission_state.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/workspace_submission_status.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/workspace_submission_status_v_2.py (94%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/workspace_submission_update.py (95%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/workspace_submission_update_info.py (100%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/workspace_submit_request.py (92%) rename seed/sdk/trace/src/seed/{resources/submission/types => submission}/workspace_traced_update.py (94%) rename seed/sdk/{circular-references/src/seed/resources/a => trace/src/seed/sysprop}/__init__.py (63%) rename seed/sdk/trace/src/seed/{resources/sysprop/client.py => sysprop/_client.py} (95%) rename seed/sdk/trace/src/seed/{resources/v_2/resources => v_2}/__init__.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/client.py => v_2/_client.py} (87%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/__init__.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/client.py => v_2/problem/_client.py} (96%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/assert_correctness_check.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/basic_custom_files.py (92%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/basic_test_case_template.py (95%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/create_problem_request_v_2.py (89%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/custom_files.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/deep_equality_correctness_check.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/default_provided_file.py (89%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/file_info_v_2.py (93%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/files.py (93%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/function_implementation.py (93%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/function_implementation_for_multiple_languages.py (90%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/function_signature.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/generated_files.py (91%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/get_basic_solution_file_request.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/get_basic_solution_file_response.py (90%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/get_function_signature_request.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/get_function_signature_response.py (90%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/get_generated_test_case_file_request.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/get_generated_test_case_template_file_request.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/lightweight_problem_info_v_2.py (87%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/non_void_function_definition.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/non_void_function_signature.py (89%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/parameter.py (90%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/parameter_id.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/problem_info_v_2.py (88%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/test_case_expects.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/test_case_function.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/test_case_id.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/test_case_implementation.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/test_case_implementation_description.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/test_case_implementation_description_board.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/test_case_implementation_reference.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/test_case_metadata.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/test_case_template.py (95%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/test_case_template_id.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/test_case_v_2.py (91%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/test_case_with_actual_result_implementation.py (95%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/void_function_definition.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/void_function_definition_that_takes_actual_result.py (95%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/void_function_signature.py (93%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/problem/types => v_2/problem}/void_function_signature_that_takes_actual_result.py (89%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources => v_2/v_3}/__init__.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/client.py => v_2/v_3/_client.py} (76%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/__init__.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/client.py => v_2/v_3/problem/_client.py} (96%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/assert_correctness_check.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/basic_custom_files.py (92%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/basic_test_case_template.py (95%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/create_problem_request_v_2.py (89%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/custom_files.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/deep_equality_correctness_check.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/default_provided_file.py (89%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/file_info_v_2.py (93%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/files.py (93%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/function_implementation.py (93%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/function_implementation_for_multiple_languages.py (90%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/function_signature.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/generated_files.py (91%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/get_basic_solution_file_request.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/get_basic_solution_file_response.py (90%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/get_function_signature_request.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/get_function_signature_response.py (89%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/get_generated_test_case_file_request.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/get_generated_test_case_template_file_request.py (93%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/lightweight_problem_info_v_2.py (86%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/non_void_function_definition.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/non_void_function_signature.py (89%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/parameter.py (89%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/parameter_id.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/problem_info_v_2.py (88%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/test_case_expects.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/test_case_function.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/test_case_id.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/test_case_implementation.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/test_case_implementation_description.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/test_case_implementation_description_board.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/test_case_implementation_reference.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/test_case_metadata.py (93%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/test_case_template.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/test_case_template_id.py (100%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/test_case_v_2.py (90%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/test_case_with_actual_result_implementation.py (95%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/void_function_definition.py (94%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/void_function_definition_that_takes_actual_result.py (95%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/void_function_signature.py (93%) rename seed/sdk/trace/src/seed/{resources/v_2/resources/v_3/resources/problem/types => v_2/v_3/problem}/void_function_signature_that_takes_actual_result.py (89%) delete mode 100644 seed/sdk/undiscriminated-unions/src/seed/resources/__init__.py delete mode 100644 seed/sdk/undiscriminated-unions/src/seed/resources/union/__init__.py rename seed/sdk/undiscriminated-unions/src/seed/{resources/union/types => union}/__init__.py (100%) rename seed/sdk/undiscriminated-unions/src/seed/{resources/union/client.py => union/_client.py} (91%) rename seed/sdk/undiscriminated-unions/src/seed/{resources/union/types => union}/my_union.py (100%) delete mode 100644 seed/sdk/unknown/src/seed/resources/__init__.py delete mode 100644 seed/sdk/unknown/src/seed/resources/unknown/__init__.py rename seed/sdk/unknown/src/seed/{resources/unknown/types => unknown}/__init__.py (100%) rename seed/sdk/unknown/src/seed/{resources/unknown/client.py => unknown/_client.py} (93%) rename seed/sdk/unknown/src/seed/{resources/unknown/types => unknown}/my_alias.py (100%) rename seed/sdk/unknown/src/seed/{resources/unknown/types => unknown}/my_object.py (93%) delete mode 100644 seed/sdk/variables/src/seed/resources/__init__.py rename seed/sdk/{no-environment/src/seed/resources => variables/src/seed/service}/__init__.py (61%) rename seed/sdk/variables/src/seed/{resources/service/client.py => service/_client.py} (94%) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 9d6207e13..9ddc102cb 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -49,7 +49,7 @@ jobs: - uses: actions/setup-node@v3 - name: Install Seed - run: npm install -g @fern-api/seed-cli@0.15.16 + run: npm install -g @fern-api/seed-cli@0.16.12-rc1 - name: Seed Test run: seed test --workspace sdk --parallel 8 @@ -72,7 +72,7 @@ jobs: run: poetry install - name: Install Seed - run: npm install -g @fern-api/seed-cli@0.15.16 + run: npm install -g @fern-api/seed-cli@0.16.12-rc1 - name: Seed Test run: seed test --workspace pydantic --parallel 6 @@ -95,7 +95,7 @@ jobs: run: poetry install - name: Install Seed - run: npm install -g @fern-api/seed-cli@0.15.16 + run: npm install -g @fern-api/seed-cli@0.16.12-rc1 - name: Seed Test run: seed test --workspace fastapi --parallel 6 diff --git a/seed/fastapi/api-wide-base-path/register.py b/seed/fastapi/api-wide-base-path/register.py index e0d14dcfb..98c6ce410 100644 --- a/seed/fastapi/api-wide-base-path/register.py +++ b/seed/fastapi/api-wide-base-path/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.service.service.service import AbstractServiceService +from .service.service.service import AbstractServiceService def register( diff --git a/seed/fastapi/api-wide-base-path/resources/service/__init__.py b/seed/fastapi/api-wide-base-path/service/__init__.py similarity index 100% rename from seed/fastapi/api-wide-base-path/resources/service/__init__.py rename to seed/fastapi/api-wide-base-path/service/__init__.py diff --git a/seed/fastapi/api-wide-base-path/resources/service/service/__init__.py b/seed/fastapi/api-wide-base-path/service/service/__init__.py similarity index 100% rename from seed/fastapi/api-wide-base-path/resources/service/service/__init__.py rename to seed/fastapi/api-wide-base-path/service/service/__init__.py diff --git a/seed/fastapi/api-wide-base-path/resources/service/service/service.py b/seed/fastapi/api-wide-base-path/service/service/service.py similarity index 93% rename from seed/fastapi/api-wide-base-path/resources/service/service/service.py rename to seed/fastapi/api-wide-base-path/service/service/service.py index 93431b548..29e0f6b92 100644 --- a/seed/fastapi/api-wide-base-path/resources/service/service/service.py +++ b/seed/fastapi/api-wide-base-path/service/service/service.py @@ -9,9 +9,9 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args class AbstractServiceService(AbstractFernService): diff --git a/seed/fastapi/audiences/__init__.py b/seed/fastapi/audiences/__init__.py index 10204b9ae..46de64574 100644 --- a/seed/fastapi/audiences/__init__.py +++ b/seed/fastapi/audiences/__init__.py @@ -1,5 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import Imported, ImportingType, OptionalString, commons, folder_a, folder_b, folder_c, foo +from . import commons, folder_a, folder_b, folder_c, foo +from .commons import Imported +from .foo import ImportingType, OptionalString __all__ = ["Imported", "ImportingType", "OptionalString", "commons", "folder_a", "folder_b", "folder_c", "foo"] diff --git a/seed/fastapi/audiences/resources/commons/__init__.py b/seed/fastapi/audiences/commons/__init__.py similarity index 100% rename from seed/fastapi/audiences/resources/commons/__init__.py rename to seed/fastapi/audiences/commons/__init__.py diff --git a/seed/fastapi/audiences/resources/commons/types/__init__.py b/seed/fastapi/audiences/commons/types/__init__.py similarity index 100% rename from seed/fastapi/audiences/resources/commons/types/__init__.py rename to seed/fastapi/audiences/commons/types/__init__.py diff --git a/seed/fastapi/audiences/resources/commons/types/imported.py b/seed/fastapi/audiences/commons/types/imported.py similarity index 94% rename from seed/fastapi/audiences/resources/commons/types/imported.py rename to seed/fastapi/audiences/commons/types/imported.py index 089627f81..203c01225 100644 --- a/seed/fastapi/audiences/resources/commons/types/imported.py +++ b/seed/fastapi/audiences/commons/types/imported.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/audiences/resources/folder_a/resources/__init__.py b/seed/fastapi/audiences/folder_a/__init__.py similarity index 100% rename from seed/fastapi/audiences/resources/folder_a/resources/__init__.py rename to seed/fastapi/audiences/folder_a/__init__.py diff --git a/seed/fastapi/audiences/resources/folder_a/resources/service/__init__.py b/seed/fastapi/audiences/folder_a/service/__init__.py similarity index 100% rename from seed/fastapi/audiences/resources/folder_a/resources/service/__init__.py rename to seed/fastapi/audiences/folder_a/service/__init__.py diff --git a/seed/fastapi/audiences/resources/folder_a/resources/service/service/__init__.py b/seed/fastapi/audiences/folder_a/service/service/__init__.py similarity index 100% rename from seed/fastapi/audiences/resources/folder_a/resources/service/service/__init__.py rename to seed/fastapi/audiences/folder_a/service/service/__init__.py diff --git a/seed/fastapi/audiences/resources/folder_a/resources/service/service/service.py b/seed/fastapi/audiences/folder_a/service/service/service.py similarity index 93% rename from seed/fastapi/audiences/resources/folder_a/resources/service/service/service.py rename to seed/fastapi/audiences/folder_a/service/service/service.py index 8dfe8accd..a9ea973eb 100644 --- a/seed/fastapi/audiences/resources/folder_a/resources/service/service/service.py +++ b/seed/fastapi/audiences/folder_a/service/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args from ..types.response import Response diff --git a/seed/fastapi/audiences/resources/folder_a/resources/service/types/__init__.py b/seed/fastapi/audiences/folder_a/service/types/__init__.py similarity index 100% rename from seed/fastapi/audiences/resources/folder_a/resources/service/types/__init__.py rename to seed/fastapi/audiences/folder_a/service/types/__init__.py diff --git a/seed/fastapi/audiences/folder_a/service/types/response.py b/seed/fastapi/audiences/folder_a/service/types/response.py new file mode 100644 index 000000000..554e8c584 --- /dev/null +++ b/seed/fastapi/audiences/folder_a/service/types/response.py @@ -0,0 +1,28 @@ +# This file was auto-generated by Fern from our API Definition. + +import datetime as dt +import typing + +from ....core.datetime_utils import serialize_datetime +from ....folder_b.common.types.foo import Foo + +try: + import pydantic.v1 as pydantic # type: ignore +except ImportError: + import pydantic # type: ignore + + +class Response(pydantic.BaseModel): + foo: typing.Optional[Foo] + + def json(self, **kwargs: typing.Any) -> str: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().json(**kwargs_with_defaults) + + def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().dict(**kwargs_with_defaults) + + class Config: + extra = pydantic.Extra.forbid + json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/fastapi/audiences/resources/folder_b/resources/__init__.py b/seed/fastapi/audiences/folder_b/__init__.py similarity index 100% rename from seed/fastapi/audiences/resources/folder_b/resources/__init__.py rename to seed/fastapi/audiences/folder_b/__init__.py diff --git a/seed/fastapi/audiences/resources/folder_b/resources/common/__init__.py b/seed/fastapi/audiences/folder_b/common/__init__.py similarity index 100% rename from seed/fastapi/audiences/resources/folder_b/resources/common/__init__.py rename to seed/fastapi/audiences/folder_b/common/__init__.py diff --git a/seed/fastapi/audiences/resources/folder_b/resources/common/types/__init__.py b/seed/fastapi/audiences/folder_b/common/types/__init__.py similarity index 100% rename from seed/fastapi/audiences/resources/folder_b/resources/common/types/__init__.py rename to seed/fastapi/audiences/folder_b/common/types/__init__.py diff --git a/seed/fastapi/audiences/folder_b/common/types/foo.py b/seed/fastapi/audiences/folder_b/common/types/foo.py new file mode 100644 index 000000000..e25d8c6cd --- /dev/null +++ b/seed/fastapi/audiences/folder_b/common/types/foo.py @@ -0,0 +1,28 @@ +# This file was auto-generated by Fern from our API Definition. + +import datetime as dt +import typing + +from ....core.datetime_utils import serialize_datetime +from ....folder_c.common.types.foo import Foo as folder_c_common_types_foo_Foo + +try: + import pydantic.v1 as pydantic # type: ignore +except ImportError: + import pydantic # type: ignore + + +class Foo(pydantic.BaseModel): + foo: typing.Optional[folder_c_common_types_foo_Foo] + + def json(self, **kwargs: typing.Any) -> str: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().json(**kwargs_with_defaults) + + def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().dict(**kwargs_with_defaults) + + class Config: + extra = pydantic.Extra.forbid + json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/fastapi/audiences/resources/folder_c/resources/__init__.py b/seed/fastapi/audiences/folder_c/__init__.py similarity index 100% rename from seed/fastapi/audiences/resources/folder_c/resources/__init__.py rename to seed/fastapi/audiences/folder_c/__init__.py diff --git a/seed/fastapi/audiences/resources/folder_c/resources/common/__init__.py b/seed/fastapi/audiences/folder_c/common/__init__.py similarity index 100% rename from seed/fastapi/audiences/resources/folder_c/resources/common/__init__.py rename to seed/fastapi/audiences/folder_c/common/__init__.py diff --git a/seed/fastapi/audiences/resources/folder_c/resources/common/types/__init__.py b/seed/fastapi/audiences/folder_c/common/types/__init__.py similarity index 100% rename from seed/fastapi/audiences/resources/folder_c/resources/common/types/__init__.py rename to seed/fastapi/audiences/folder_c/common/types/__init__.py diff --git a/seed/fastapi/audiences/resources/folder_c/resources/common/types/foo.py b/seed/fastapi/audiences/folder_c/common/types/foo.py similarity index 93% rename from seed/fastapi/audiences/resources/folder_c/resources/common/types/foo.py rename to seed/fastapi/audiences/folder_c/common/types/foo.py index 4ed6bb03d..98ad638d6 100644 --- a/seed/fastapi/audiences/resources/folder_c/resources/common/types/foo.py +++ b/seed/fastapi/audiences/folder_c/common/types/foo.py @@ -4,7 +4,7 @@ import typing import uuid -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/audiences/resources/foo/__init__.py b/seed/fastapi/audiences/foo/__init__.py similarity index 100% rename from seed/fastapi/audiences/resources/foo/__init__.py rename to seed/fastapi/audiences/foo/__init__.py diff --git a/seed/fastapi/audiences/resources/foo/service/__init__.py b/seed/fastapi/audiences/foo/service/__init__.py similarity index 100% rename from seed/fastapi/audiences/resources/foo/service/__init__.py rename to seed/fastapi/audiences/foo/service/__init__.py diff --git a/seed/fastapi/audiences/resources/foo/service/service.py b/seed/fastapi/audiences/foo/service/service.py similarity index 93% rename from seed/fastapi/audiences/resources/foo/service/service.py rename to seed/fastapi/audiences/foo/service/service.py index c813b319f..8e17526b9 100644 --- a/seed/fastapi/audiences/resources/foo/service/service.py +++ b/seed/fastapi/audiences/foo/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ..types.importing_type import ImportingType diff --git a/seed/fastapi/audiences/resources/foo/types/__init__.py b/seed/fastapi/audiences/foo/types/__init__.py similarity index 100% rename from seed/fastapi/audiences/resources/foo/types/__init__.py rename to seed/fastapi/audiences/foo/types/__init__.py diff --git a/seed/fastapi/audiences/resources/foo/types/importing_type.py b/seed/fastapi/audiences/foo/types/importing_type.py similarity index 94% rename from seed/fastapi/audiences/resources/foo/types/importing_type.py rename to seed/fastapi/audiences/foo/types/importing_type.py index ca717c911..b77fcff8f 100644 --- a/seed/fastapi/audiences/resources/foo/types/importing_type.py +++ b/seed/fastapi/audiences/foo/types/importing_type.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.imported import Imported +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/audiences/resources/foo/types/optional_string.py b/seed/fastapi/audiences/foo/types/optional_string.py similarity index 95% rename from seed/fastapi/audiences/resources/foo/types/optional_string.py rename to seed/fastapi/audiences/foo/types/optional_string.py index 8753063a8..3fbf49f13 100644 --- a/seed/fastapi/audiences/resources/foo/types/optional_string.py +++ b/seed/fastapi/audiences/foo/types/optional_string.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/audiences/register.py b/seed/fastapi/audiences/register.py index 459e2185f..d02c48bf1 100644 --- a/seed/fastapi/audiences/register.py +++ b/seed/fastapi/audiences/register.py @@ -13,8 +13,8 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.folder_a.resources.service.service.service import AbstractFolderAServiceService -from .resources.foo.service.service import AbstractFooService +from .folder_a.service.service.service import AbstractFolderAServiceService +from .foo.service.service import AbstractFooService def register( diff --git a/seed/fastapi/audiences/resources/__init__.py b/seed/fastapi/audiences/resources/__init__.py deleted file mode 100644 index 46de64574..000000000 --- a/seed/fastapi/audiences/resources/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import commons, folder_a, folder_b, folder_c, foo -from .commons import Imported -from .foo import ImportingType, OptionalString - -__all__ = ["Imported", "ImportingType", "OptionalString", "commons", "folder_a", "folder_b", "folder_c", "foo"] diff --git a/seed/fastapi/audiences/resources/folder_a/__init__.py b/seed/fastapi/audiences/resources/folder_a/__init__.py deleted file mode 100644 index 68f550d75..000000000 --- a/seed/fastapi/audiences/resources/folder_a/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import Response, service - -__all__ = ["Response", "service"] diff --git a/seed/fastapi/audiences/resources/folder_a/resources/service/types/response.py b/seed/fastapi/audiences/resources/folder_a/resources/service/types/response.py deleted file mode 100644 index 92ce5f7c9..000000000 --- a/seed/fastapi/audiences/resources/folder_a/resources/service/types/response.py +++ /dev/null @@ -1,28 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -import datetime as dt -import typing - -from ......core.datetime_utils import serialize_datetime -from .....folder_b.resources.common.types.foo import Foo - -try: - import pydantic.v1 as pydantic # type: ignore -except ImportError: - import pydantic # type: ignore - - -class Response(pydantic.BaseModel): - foo: typing.Optional[Foo] - - def json(self, **kwargs: typing.Any) -> str: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().json(**kwargs_with_defaults) - - def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().dict(**kwargs_with_defaults) - - class Config: - extra = pydantic.Extra.forbid - json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/fastapi/audiences/resources/folder_b/__init__.py b/seed/fastapi/audiences/resources/folder_b/__init__.py deleted file mode 100644 index 995ed6291..000000000 --- a/seed/fastapi/audiences/resources/folder_b/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import Foo, common - -__all__ = ["Foo", "common"] diff --git a/seed/fastapi/audiences/resources/folder_b/resources/common/types/foo.py b/seed/fastapi/audiences/resources/folder_b/resources/common/types/foo.py deleted file mode 100644 index c6a322646..000000000 --- a/seed/fastapi/audiences/resources/folder_b/resources/common/types/foo.py +++ /dev/null @@ -1,28 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -import datetime as dt -import typing - -from ......core.datetime_utils import serialize_datetime -from .....folder_c.resources.common.types.foo import Foo as resources_folder_c_resources_common_types_foo_Foo - -try: - import pydantic.v1 as pydantic # type: ignore -except ImportError: - import pydantic # type: ignore - - -class Foo(pydantic.BaseModel): - foo: typing.Optional[resources_folder_c_resources_common_types_foo_Foo] - - def json(self, **kwargs: typing.Any) -> str: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().json(**kwargs_with_defaults) - - def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().dict(**kwargs_with_defaults) - - class Config: - extra = pydantic.Extra.forbid - json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/fastapi/audiences/resources/folder_c/__init__.py b/seed/fastapi/audiences/resources/folder_c/__init__.py deleted file mode 100644 index 995ed6291..000000000 --- a/seed/fastapi/audiences/resources/folder_c/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import Foo, common - -__all__ = ["Foo", "common"] diff --git a/seed/fastapi/auth-environment-variables/register.py b/seed/fastapi/auth-environment-variables/register.py index e0d14dcfb..98c6ce410 100644 --- a/seed/fastapi/auth-environment-variables/register.py +++ b/seed/fastapi/auth-environment-variables/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.service.service.service import AbstractServiceService +from .service.service.service import AbstractServiceService def register( diff --git a/seed/fastapi/auth-environment-variables/resources/service/__init__.py b/seed/fastapi/auth-environment-variables/service/__init__.py similarity index 100% rename from seed/fastapi/auth-environment-variables/resources/service/__init__.py rename to seed/fastapi/auth-environment-variables/service/__init__.py diff --git a/seed/fastapi/auth-environment-variables/resources/service/service/__init__.py b/seed/fastapi/auth-environment-variables/service/service/__init__.py similarity index 100% rename from seed/fastapi/auth-environment-variables/resources/service/service/__init__.py rename to seed/fastapi/auth-environment-variables/service/service/__init__.py diff --git a/seed/fastapi/auth-environment-variables/resources/service/service/service.py b/seed/fastapi/auth-environment-variables/service/service/service.py similarity index 92% rename from seed/fastapi/auth-environment-variables/resources/service/service/service.py rename to seed/fastapi/auth-environment-variables/service/service/service.py index 21d9ad5e2..57d55a4fc 100644 --- a/seed/fastapi/auth-environment-variables/resources/service/service/service.py +++ b/seed/fastapi/auth-environment-variables/service/service/service.py @@ -8,10 +8,10 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args +from ...security import ApiAuth, FernAuth class AbstractServiceService(AbstractFernService): diff --git a/seed/fastapi/basic-auth/__init__.py b/seed/fastapi/basic-auth/__init__.py index d1fdab59d..d2e0f4b73 100644 --- a/seed/fastapi/basic-auth/__init__.py +++ b/seed/fastapi/basic-auth/__init__.py @@ -1,6 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import BadRequest, UnauthorizedRequest, UnauthorizedRequestErrorBody, errors +from . import errors +from .errors import BadRequest, UnauthorizedRequest, UnauthorizedRequestErrorBody from .security import ApiAuth __all__ = ["ApiAuth", "BadRequest", "UnauthorizedRequest", "UnauthorizedRequestErrorBody", "errors"] diff --git a/seed/fastapi/basic-auth/resources/basic_auth/__init__.py b/seed/fastapi/basic-auth/basic_auth/__init__.py similarity index 100% rename from seed/fastapi/basic-auth/resources/basic_auth/__init__.py rename to seed/fastapi/basic-auth/basic_auth/__init__.py diff --git a/seed/fastapi/basic-auth/resources/basic_auth/service/__init__.py b/seed/fastapi/basic-auth/basic_auth/service/__init__.py similarity index 100% rename from seed/fastapi/basic-auth/resources/basic_auth/service/__init__.py rename to seed/fastapi/basic-auth/basic_auth/service/__init__.py diff --git a/seed/fastapi/basic-auth/resources/basic_auth/service/service.py b/seed/fastapi/basic-auth/basic_auth/service/service.py similarity index 95% rename from seed/fastapi/basic-auth/resources/basic_auth/service/service.py rename to seed/fastapi/basic-auth/basic_auth/service/service.py index 1b38a4d08..54216e31a 100644 --- a/seed/fastapi/basic-auth/resources/basic_auth/service/service.py +++ b/seed/fastapi/basic-auth/basic_auth/service/service.py @@ -8,12 +8,12 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ...errors.errors.bad_request import BadRequest from ...errors.errors.unauthorized_request import UnauthorizedRequest +from ...security import ApiAuth, FernAuth class AbstractBasicAuthService(AbstractFernService): diff --git a/seed/fastapi/basic-auth/resources/errors/__init__.py b/seed/fastapi/basic-auth/errors/__init__.py similarity index 100% rename from seed/fastapi/basic-auth/resources/errors/__init__.py rename to seed/fastapi/basic-auth/errors/__init__.py diff --git a/seed/fastapi/basic-auth/resources/errors/errors/__init__.py b/seed/fastapi/basic-auth/errors/errors/__init__.py similarity index 100% rename from seed/fastapi/basic-auth/resources/errors/errors/__init__.py rename to seed/fastapi/basic-auth/errors/errors/__init__.py diff --git a/seed/fastapi/custom-auth/resources/errors/errors/bad_request.py b/seed/fastapi/basic-auth/errors/errors/bad_request.py similarity index 73% rename from seed/fastapi/custom-auth/resources/errors/errors/bad_request.py rename to seed/fastapi/basic-auth/errors/errors/bad_request.py index 346de89de..333b1aa01 100644 --- a/seed/fastapi/custom-auth/resources/errors/errors/bad_request.py +++ b/seed/fastapi/basic-auth/errors/errors/bad_request.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...core.exceptions.fern_http_exception import FernHTTPException class BadRequest(FernHTTPException): diff --git a/seed/fastapi/custom-auth/resources/errors/errors/unauthorized_request.py b/seed/fastapi/basic-auth/errors/errors/unauthorized_request.py similarity index 82% rename from seed/fastapi/custom-auth/resources/errors/errors/unauthorized_request.py rename to seed/fastapi/basic-auth/errors/errors/unauthorized_request.py index 1eb9a00fe..39649935a 100644 --- a/seed/fastapi/custom-auth/resources/errors/errors/unauthorized_request.py +++ b/seed/fastapi/basic-auth/errors/errors/unauthorized_request.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...core.exceptions.fern_http_exception import FernHTTPException from ..types.unauthorized_request_error_body import UnauthorizedRequestErrorBody diff --git a/seed/fastapi/basic-auth/resources/errors/types/__init__.py b/seed/fastapi/basic-auth/errors/types/__init__.py similarity index 100% rename from seed/fastapi/basic-auth/resources/errors/types/__init__.py rename to seed/fastapi/basic-auth/errors/types/__init__.py diff --git a/seed/fastapi/custom-auth/resources/errors/types/unauthorized_request_error_body.py b/seed/fastapi/basic-auth/errors/types/unauthorized_request_error_body.py similarity index 93% rename from seed/fastapi/custom-auth/resources/errors/types/unauthorized_request_error_body.py rename to seed/fastapi/basic-auth/errors/types/unauthorized_request_error_body.py index c2681050e..1ea96c98b 100644 --- a/seed/fastapi/custom-auth/resources/errors/types/unauthorized_request_error_body.py +++ b/seed/fastapi/basic-auth/errors/types/unauthorized_request_error_body.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/basic-auth/register.py b/seed/fastapi/basic-auth/register.py index 9ee6290b7..f815723c6 100644 --- a/seed/fastapi/basic-auth/register.py +++ b/seed/fastapi/basic-auth/register.py @@ -10,10 +10,10 @@ import starlette from fastapi import params +from .basic_auth.service.service import AbstractBasicAuthService from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.basic_auth.service.service import AbstractBasicAuthService def register( diff --git a/seed/fastapi/basic-auth/resources/__init__.py b/seed/fastapi/basic-auth/resources/__init__.py deleted file mode 100644 index f79f35dad..000000000 --- a/seed/fastapi/basic-auth/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import errors -from .errors import BadRequest, UnauthorizedRequest, UnauthorizedRequestErrorBody - -__all__ = ["BadRequest", "UnauthorizedRequest", "UnauthorizedRequestErrorBody", "errors"] diff --git a/seed/fastapi/bearer-token-environment-variable/register.py b/seed/fastapi/bearer-token-environment-variable/register.py index e0d14dcfb..98c6ce410 100644 --- a/seed/fastapi/bearer-token-environment-variable/register.py +++ b/seed/fastapi/bearer-token-environment-variable/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.service.service.service import AbstractServiceService +from .service.service.service import AbstractServiceService def register( diff --git a/seed/fastapi/bearer-token-environment-variable/resources/service/__init__.py b/seed/fastapi/bearer-token-environment-variable/service/__init__.py similarity index 100% rename from seed/fastapi/bearer-token-environment-variable/resources/service/__init__.py rename to seed/fastapi/bearer-token-environment-variable/service/__init__.py diff --git a/seed/fastapi/bearer-token-environment-variable/resources/service/service/__init__.py b/seed/fastapi/bearer-token-environment-variable/service/service/__init__.py similarity index 100% rename from seed/fastapi/bearer-token-environment-variable/resources/service/service/__init__.py rename to seed/fastapi/bearer-token-environment-variable/service/service/__init__.py diff --git a/seed/fastapi/bearer-token-environment-variable/resources/service/service/service.py b/seed/fastapi/bearer-token-environment-variable/service/service/service.py similarity index 92% rename from seed/fastapi/bearer-token-environment-variable/resources/service/service/service.py rename to seed/fastapi/bearer-token-environment-variable/service/service/service.py index 951f259c7..53f6b29bc 100644 --- a/seed/fastapi/bearer-token-environment-variable/resources/service/service/service.py +++ b/seed/fastapi/bearer-token-environment-variable/service/service/service.py @@ -8,10 +8,10 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args +from ...security import ApiAuth, FernAuth class AbstractServiceService(AbstractFernService): diff --git a/seed/fastapi/circular-references/__init__.py b/seed/fastapi/circular-references/__init__.py index 270660862..d422ecb74 100644 --- a/seed/fastapi/circular-references/__init__.py +++ b/seed/fastapi/circular-references/__init__.py @@ -1,6 +1,8 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import A, ContainerValue, FieldValue, ObjectValue, PrimitiveValue, a, ast +from . import a, ast +from .a import A +from .ast import ContainerValue, FieldValue, ObjectValue, PrimitiveValue from .types import ImportingA, RootType __all__ = ["A", "ContainerValue", "FieldValue", "ImportingA", "ObjectValue", "PrimitiveValue", "RootType", "a", "ast"] diff --git a/seed/fastapi/circular-references/resources/a/__init__.py b/seed/fastapi/circular-references/a/__init__.py similarity index 100% rename from seed/fastapi/circular-references/resources/a/__init__.py rename to seed/fastapi/circular-references/a/__init__.py diff --git a/seed/fastapi/circular-references/resources/a/types/__init__.py b/seed/fastapi/circular-references/a/types/__init__.py similarity index 100% rename from seed/fastapi/circular-references/resources/a/types/__init__.py rename to seed/fastapi/circular-references/a/types/__init__.py diff --git a/seed/fastapi/circular-references/resources/a/types/a.py b/seed/fastapi/circular-references/a/types/a.py similarity index 89% rename from seed/fastapi/circular-references/resources/a/types/a.py rename to seed/fastapi/circular-references/a/types/a.py index 06e9a8e06..9b440bd15 100644 --- a/seed/fastapi/circular-references/resources/a/types/a.py +++ b/seed/fastapi/circular-references/a/types/a.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ....types.root_type import RootType +from ...core.datetime_utils import serialize_datetime +from ...types.root_type import RootType try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/circular-references/resources/ast/__init__.py b/seed/fastapi/circular-references/ast/__init__.py similarity index 100% rename from seed/fastapi/circular-references/resources/ast/__init__.py rename to seed/fastapi/circular-references/ast/__init__.py diff --git a/seed/fastapi/circular-references/resources/ast/types/__init__.py b/seed/fastapi/circular-references/ast/types/__init__.py similarity index 100% rename from seed/fastapi/circular-references/resources/ast/types/__init__.py rename to seed/fastapi/circular-references/ast/types/__init__.py diff --git a/seed/fastapi/circular-references/resources/ast/types/container_value.py b/seed/fastapi/circular-references/ast/types/container_value.py similarity index 97% rename from seed/fastapi/circular-references/resources/ast/types/container_value.py rename to seed/fastapi/circular-references/ast/types/container_value.py index b47e86b12..7468dca12 100644 --- a/seed/fastapi/circular-references/resources/ast/types/container_value.py +++ b/seed/fastapi/circular-references/ast/types/container_value.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/circular-references/resources/ast/types/field_value.py b/seed/fastapi/circular-references/ast/types/field_value.py similarity index 64% rename from seed/fastapi/circular-references/resources/ast/types/field_value.py rename to seed/fastapi/circular-references/ast/types/field_value.py index 3d9f7518a..da58704c0 100644 --- a/seed/fastapi/circular-references/resources/ast/types/field_value.py +++ b/seed/fastapi/circular-references/ast/types/field_value.py @@ -7,9 +7,9 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime -from .object_value import ObjectValue as resources_ast_types_object_value_ObjectValue -from .primitive_value import PrimitiveValue as resources_ast_types_primitive_value_PrimitiveValue +from ...core.datetime_utils import serialize_datetime +from .object_value import ObjectValue as ast_types_object_value_ObjectValue +from .primitive_value import PrimitiveValue as ast_types_primitive_value_PrimitiveValue try: import pydantic.v1 as pydantic # type: ignore @@ -20,13 +20,13 @@ class _Factory: - def primitive_value(self, value: resources_ast_types_primitive_value_PrimitiveValue) -> FieldValue: + def primitive_value(self, value: ast_types_primitive_value_PrimitiveValue) -> FieldValue: return FieldValue(__root__=_FieldValue.PrimitiveValue(type="primitive_value", value=value)) - def object_value(self, value: resources_ast_types_object_value_ObjectValue) -> FieldValue: + def object_value(self, value: ast_types_object_value_ObjectValue) -> FieldValue: return FieldValue(__root__=_FieldValue.ObjectValue(**value.dict(exclude_unset=True), type="object_value")) - def container_value(self, value: resources_ast_types_container_value_ContainerValue) -> FieldValue: + def container_value(self, value: ast_types_container_value_ContainerValue) -> FieldValue: return FieldValue(__root__=_FieldValue.ContainerValue(type="container_value", value=value)) @@ -40,15 +40,15 @@ def get_as_union( def visit( self, - primitive_value: typing.Callable[[resources_ast_types_primitive_value_PrimitiveValue], T_Result], - object_value: typing.Callable[[resources_ast_types_object_value_ObjectValue], T_Result], - container_value: typing.Callable[[resources_ast_types_container_value_ContainerValue], T_Result], + primitive_value: typing.Callable[[ast_types_primitive_value_PrimitiveValue], T_Result], + object_value: typing.Callable[[ast_types_object_value_ObjectValue], T_Result], + container_value: typing.Callable[[ast_types_container_value_ContainerValue], T_Result], ) -> T_Result: if self.__root__.type == "primitive_value": return primitive_value(self.__root__.value) if self.__root__.type == "object_value": return object_value( - resources_ast_types_object_value_ObjectValue(**self.__root__.dict(exclude_unset=True, exclude={"type"})) + ast_types_object_value_ObjectValue(**self.__root__.dict(exclude_unset=True, exclude={"type"})) ) if self.__root__.type == "container_value": return container_value(self.__root__.value) @@ -71,15 +71,15 @@ class Config: json_encoders = {dt.datetime: serialize_datetime} -from .container_value import ContainerValue as resources_ast_types_container_value_ContainerValue # noqa: E402 +from .container_value import ContainerValue as ast_types_container_value_ContainerValue # noqa: E402 class _FieldValue: class PrimitiveValue(pydantic.BaseModel): type: typing_extensions.Literal["primitive_value"] - value: resources_ast_types_primitive_value_PrimitiveValue + value: ast_types_primitive_value_PrimitiveValue - class ObjectValue(resources_ast_types_object_value_ObjectValue): + class ObjectValue(ast_types_object_value_ObjectValue): type: typing_extensions.Literal["object_value"] class Config: @@ -87,10 +87,10 @@ class Config: class ContainerValue(pydantic.BaseModel): type: typing_extensions.Literal["container_value"] - value: resources_ast_types_container_value_ContainerValue + value: ast_types_container_value_ContainerValue _FieldValue.ContainerValue.update_forward_refs( - ContainerValue=resources_ast_types_container_value_ContainerValue, FieldValue=FieldValue + ContainerValue=ast_types_container_value_ContainerValue, FieldValue=FieldValue ) FieldValue.update_forward_refs() diff --git a/seed/fastapi/circular-references/resources/ast/types/object_value.py b/seed/fastapi/circular-references/ast/types/object_value.py similarity index 93% rename from seed/fastapi/circular-references/resources/ast/types/object_value.py rename to seed/fastapi/circular-references/ast/types/object_value.py index 3313c2b1c..ec6debd9f 100644 --- a/seed/fastapi/circular-references/resources/ast/types/object_value.py +++ b/seed/fastapi/circular-references/ast/types/object_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/circular-references/resources/ast/types/primitive_value.py b/seed/fastapi/circular-references/ast/types/primitive_value.py similarity index 100% rename from seed/fastapi/circular-references/resources/ast/types/primitive_value.py rename to seed/fastapi/circular-references/ast/types/primitive_value.py diff --git a/seed/fastapi/circular-references/resources/__init__.py b/seed/fastapi/circular-references/resources/__init__.py deleted file mode 100644 index 447ec55a7..000000000 --- a/seed/fastapi/circular-references/resources/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import a, ast -from .a import A -from .ast import ContainerValue, FieldValue, ObjectValue, PrimitiveValue - -__all__ = ["A", "ContainerValue", "FieldValue", "ObjectValue", "PrimitiveValue", "a", "ast"] diff --git a/seed/fastapi/circular-references/types/importing_a.py b/seed/fastapi/circular-references/types/importing_a.py index a5cfa104a..f62f4d810 100644 --- a/seed/fastapi/circular-references/types/importing_a.py +++ b/seed/fastapi/circular-references/types/importing_a.py @@ -3,8 +3,8 @@ import datetime as dt import typing +from ..a.types.a import A from ..core.datetime_utils import serialize_datetime -from ..resources.a.types.a import A try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/custom-auth/__init__.py b/seed/fastapi/custom-auth/__init__.py index d1fdab59d..d2e0f4b73 100644 --- a/seed/fastapi/custom-auth/__init__.py +++ b/seed/fastapi/custom-auth/__init__.py @@ -1,6 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import BadRequest, UnauthorizedRequest, UnauthorizedRequestErrorBody, errors +from . import errors +from .errors import BadRequest, UnauthorizedRequest, UnauthorizedRequestErrorBody from .security import ApiAuth __all__ = ["ApiAuth", "BadRequest", "UnauthorizedRequest", "UnauthorizedRequestErrorBody", "errors"] diff --git a/seed/fastapi/custom-auth/resources/custom_auth/__init__.py b/seed/fastapi/custom-auth/custom_auth/__init__.py similarity index 100% rename from seed/fastapi/custom-auth/resources/custom_auth/__init__.py rename to seed/fastapi/custom-auth/custom_auth/__init__.py diff --git a/seed/fastapi/custom-auth/resources/custom_auth/service/__init__.py b/seed/fastapi/custom-auth/custom_auth/service/__init__.py similarity index 100% rename from seed/fastapi/custom-auth/resources/custom_auth/service/__init__.py rename to seed/fastapi/custom-auth/custom_auth/service/__init__.py diff --git a/seed/fastapi/custom-auth/resources/custom_auth/service/service.py b/seed/fastapi/custom-auth/custom_auth/service/service.py similarity index 95% rename from seed/fastapi/custom-auth/resources/custom_auth/service/service.py rename to seed/fastapi/custom-auth/custom_auth/service/service.py index 8cbbd6e80..dadd3c7cc 100644 --- a/seed/fastapi/custom-auth/resources/custom_auth/service/service.py +++ b/seed/fastapi/custom-auth/custom_auth/service/service.py @@ -8,12 +8,12 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ...errors.errors.bad_request import BadRequest from ...errors.errors.unauthorized_request import UnauthorizedRequest +from ...security import ApiAuth, FernAuth class AbstractCustomAuthService(AbstractFernService): diff --git a/seed/fastapi/custom-auth/resources/errors/__init__.py b/seed/fastapi/custom-auth/errors/__init__.py similarity index 100% rename from seed/fastapi/custom-auth/resources/errors/__init__.py rename to seed/fastapi/custom-auth/errors/__init__.py diff --git a/seed/fastapi/custom-auth/resources/errors/errors/__init__.py b/seed/fastapi/custom-auth/errors/errors/__init__.py similarity index 100% rename from seed/fastapi/custom-auth/resources/errors/errors/__init__.py rename to seed/fastapi/custom-auth/errors/errors/__init__.py diff --git a/seed/fastapi/basic-auth/resources/errors/errors/bad_request.py b/seed/fastapi/custom-auth/errors/errors/bad_request.py similarity index 73% rename from seed/fastapi/basic-auth/resources/errors/errors/bad_request.py rename to seed/fastapi/custom-auth/errors/errors/bad_request.py index 346de89de..333b1aa01 100644 --- a/seed/fastapi/basic-auth/resources/errors/errors/bad_request.py +++ b/seed/fastapi/custom-auth/errors/errors/bad_request.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...core.exceptions.fern_http_exception import FernHTTPException class BadRequest(FernHTTPException): diff --git a/seed/fastapi/basic-auth/resources/errors/errors/unauthorized_request.py b/seed/fastapi/custom-auth/errors/errors/unauthorized_request.py similarity index 82% rename from seed/fastapi/basic-auth/resources/errors/errors/unauthorized_request.py rename to seed/fastapi/custom-auth/errors/errors/unauthorized_request.py index 1eb9a00fe..39649935a 100644 --- a/seed/fastapi/basic-auth/resources/errors/errors/unauthorized_request.py +++ b/seed/fastapi/custom-auth/errors/errors/unauthorized_request.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...core.exceptions.fern_http_exception import FernHTTPException from ..types.unauthorized_request_error_body import UnauthorizedRequestErrorBody diff --git a/seed/fastapi/custom-auth/resources/errors/types/__init__.py b/seed/fastapi/custom-auth/errors/types/__init__.py similarity index 100% rename from seed/fastapi/custom-auth/resources/errors/types/__init__.py rename to seed/fastapi/custom-auth/errors/types/__init__.py diff --git a/seed/fastapi/basic-auth/resources/errors/types/unauthorized_request_error_body.py b/seed/fastapi/custom-auth/errors/types/unauthorized_request_error_body.py similarity index 93% rename from seed/fastapi/basic-auth/resources/errors/types/unauthorized_request_error_body.py rename to seed/fastapi/custom-auth/errors/types/unauthorized_request_error_body.py index c2681050e..1ea96c98b 100644 --- a/seed/fastapi/basic-auth/resources/errors/types/unauthorized_request_error_body.py +++ b/seed/fastapi/custom-auth/errors/types/unauthorized_request_error_body.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/custom-auth/register.py b/seed/fastapi/custom-auth/register.py index ad9275e7f..f082e35ec 100644 --- a/seed/fastapi/custom-auth/register.py +++ b/seed/fastapi/custom-auth/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.custom_auth.service.service import AbstractCustomAuthService +from .custom_auth.service.service import AbstractCustomAuthService def register( diff --git a/seed/fastapi/custom-auth/resources/__init__.py b/seed/fastapi/custom-auth/resources/__init__.py deleted file mode 100644 index f79f35dad..000000000 --- a/seed/fastapi/custom-auth/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import errors -from .errors import BadRequest, UnauthorizedRequest, UnauthorizedRequestErrorBody - -__all__ = ["BadRequest", "UnauthorizedRequest", "UnauthorizedRequestErrorBody", "errors"] diff --git a/seed/fastapi/enum-query-params/__init__.py b/seed/fastapi/enum-query-params/__init__.py index 97264068f..4938303a0 100644 --- a/seed/fastapi/enum-query-params/__init__.py +++ b/seed/fastapi/enum-query-params/__init__.py @@ -1,6 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import MyEnum, svc +from . import svc from .security import ApiAuth +from .svc import MyEnum __all__ = ["ApiAuth", "MyEnum", "svc"] diff --git a/seed/fastapi/enum-query-params/register.py b/seed/fastapi/enum-query-params/register.py index eaa493594..7b8067bba 100644 --- a/seed/fastapi/enum-query-params/register.py +++ b/seed/fastapi/enum-query-params/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.svc.service.service import AbstractSvcService +from .svc.service.service import AbstractSvcService def register( diff --git a/seed/fastapi/enum-query-params/resources/__init__.py b/seed/fastapi/enum-query-params/resources/__init__.py deleted file mode 100644 index 427098850..000000000 --- a/seed/fastapi/enum-query-params/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import svc -from .svc import MyEnum - -__all__ = ["MyEnum", "svc"] diff --git a/seed/fastapi/enum-query-params/resources/svc/__init__.py b/seed/fastapi/enum-query-params/svc/__init__.py similarity index 100% rename from seed/fastapi/enum-query-params/resources/svc/__init__.py rename to seed/fastapi/enum-query-params/svc/__init__.py diff --git a/seed/fastapi/enum-query-params/resources/svc/service/__init__.py b/seed/fastapi/enum-query-params/svc/service/__init__.py similarity index 100% rename from seed/fastapi/enum-query-params/resources/svc/service/__init__.py rename to seed/fastapi/enum-query-params/svc/service/__init__.py diff --git a/seed/fastapi/enum-query-params/resources/svc/service/service.py b/seed/fastapi/enum-query-params/svc/service/service.py similarity index 93% rename from seed/fastapi/enum-query-params/resources/svc/service/service.py rename to seed/fastapi/enum-query-params/svc/service/service.py index 230762841..4ce0ac40d 100644 --- a/seed/fastapi/enum-query-params/resources/svc/service/service.py +++ b/seed/fastapi/enum-query-params/svc/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ..types.my_enum import MyEnum diff --git a/seed/fastapi/enum-query-params/resources/svc/types/__init__.py b/seed/fastapi/enum-query-params/svc/types/__init__.py similarity index 100% rename from seed/fastapi/enum-query-params/resources/svc/types/__init__.py rename to seed/fastapi/enum-query-params/svc/types/__init__.py diff --git a/seed/fastapi/enum-query-params/resources/svc/types/my_enum.py b/seed/fastapi/enum-query-params/svc/types/my_enum.py similarity index 100% rename from seed/fastapi/enum-query-params/resources/svc/types/my_enum.py rename to seed/fastapi/enum-query-params/svc/types/my_enum.py diff --git a/seed/fastapi/error-property/__init__.py b/seed/fastapi/error-property/__init__.py index b9a3868b0..bde766f1c 100644 --- a/seed/fastapi/error-property/__init__.py +++ b/seed/fastapi/error-property/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import PropertyBasedErrorTest, PropertyBasedErrorTestBody, errors +from . import errors +from .errors import PropertyBasedErrorTest, PropertyBasedErrorTestBody __all__ = ["PropertyBasedErrorTest", "PropertyBasedErrorTestBody", "errors"] diff --git a/seed/fastapi/error-property/resources/errors/__init__.py b/seed/fastapi/error-property/errors/__init__.py similarity index 100% rename from seed/fastapi/error-property/resources/errors/__init__.py rename to seed/fastapi/error-property/errors/__init__.py diff --git a/seed/fastapi/error-property/resources/errors/errors/__init__.py b/seed/fastapi/error-property/errors/errors/__init__.py similarity index 100% rename from seed/fastapi/error-property/resources/errors/errors/__init__.py rename to seed/fastapi/error-property/errors/errors/__init__.py diff --git a/seed/fastapi/error-property/resources/errors/errors/property_based_error_test.py b/seed/fastapi/error-property/errors/errors/property_based_error_test.py similarity index 82% rename from seed/fastapi/error-property/resources/errors/errors/property_based_error_test.py rename to seed/fastapi/error-property/errors/errors/property_based_error_test.py index 904dd4668..9f76c53ab 100644 --- a/seed/fastapi/error-property/resources/errors/errors/property_based_error_test.py +++ b/seed/fastapi/error-property/errors/errors/property_based_error_test.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...core.exceptions.fern_http_exception import FernHTTPException from ..types.property_based_error_test_body import PropertyBasedErrorTestBody diff --git a/seed/fastapi/error-property/resources/errors/types/__init__.py b/seed/fastapi/error-property/errors/types/__init__.py similarity index 100% rename from seed/fastapi/error-property/resources/errors/types/__init__.py rename to seed/fastapi/error-property/errors/types/__init__.py diff --git a/seed/fastapi/error-property/resources/errors/types/property_based_error_test_body.py b/seed/fastapi/error-property/errors/types/property_based_error_test_body.py similarity index 93% rename from seed/fastapi/error-property/resources/errors/types/property_based_error_test_body.py rename to seed/fastapi/error-property/errors/types/property_based_error_test_body.py index 702c2f064..025ce5db0 100644 --- a/seed/fastapi/error-property/resources/errors/types/property_based_error_test_body.py +++ b/seed/fastapi/error-property/errors/types/property_based_error_test_body.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/error-property/resources/property_based_error/__init__.py b/seed/fastapi/error-property/property_based_error/__init__.py similarity index 100% rename from seed/fastapi/error-property/resources/property_based_error/__init__.py rename to seed/fastapi/error-property/property_based_error/__init__.py diff --git a/seed/fastapi/error-property/resources/property_based_error/service/__init__.py b/seed/fastapi/error-property/property_based_error/service/__init__.py similarity index 100% rename from seed/fastapi/error-property/resources/property_based_error/service/__init__.py rename to seed/fastapi/error-property/property_based_error/service/__init__.py diff --git a/seed/fastapi/error-property/resources/property_based_error/service/service.py b/seed/fastapi/error-property/property_based_error/service/service.py similarity index 93% rename from seed/fastapi/error-property/resources/property_based_error/service/service.py rename to seed/fastapi/error-property/property_based_error/service/service.py index 08ad5cc8e..21a9a5abd 100644 --- a/seed/fastapi/error-property/resources/property_based_error/service/service.py +++ b/seed/fastapi/error-property/property_based_error/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ...errors.errors.property_based_error_test import PropertyBasedErrorTest diff --git a/seed/fastapi/error-property/register.py b/seed/fastapi/error-property/register.py index 0595d3a16..d36df4fab 100644 --- a/seed/fastapi/error-property/register.py +++ b/seed/fastapi/error-property/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.property_based_error.service.service import AbstractPropertyBasedErrorService +from .property_based_error.service.service import AbstractPropertyBasedErrorService def register( diff --git a/seed/fastapi/examples/__init__.py b/seed/fastapi/examples/__init__.py index 32c55cb66..4ba1362f3 100644 --- a/seed/fastapi/examples/__init__.py +++ b/seed/fastapi/examples/__init__.py @@ -1,6 +1,8 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import ( +from . import commons, file, types +from .security import ApiAuth +from .types import ( Actor, Actress, CastMember, @@ -22,11 +24,7 @@ StuntDouble, Test, Tree, - commons, - file, - types, ) -from .security import ApiAuth __all__ = [ "Actor", diff --git a/seed/fastapi/examples/resources/commons/resources/__init__.py b/seed/fastapi/examples/commons/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/commons/resources/__init__.py rename to seed/fastapi/examples/commons/__init__.py diff --git a/seed/fastapi/examples/resources/commons/resources/types/__init__.py b/seed/fastapi/examples/commons/types/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/commons/resources/types/__init__.py rename to seed/fastapi/examples/commons/types/__init__.py diff --git a/seed/fastapi/examples/resources/commons/resources/types/types/__init__.py b/seed/fastapi/examples/commons/types/types/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/commons/resources/types/types/__init__.py rename to seed/fastapi/examples/commons/types/types/__init__.py diff --git a/seed/fastapi/examples/resources/commons/resources/types/types/data.py b/seed/fastapi/examples/commons/types/types/data.py similarity index 94% rename from seed/fastapi/examples/resources/commons/resources/types/types/data.py rename to seed/fastapi/examples/commons/types/types/data.py index d2e695084..b6f0f75b4 100644 --- a/seed/fastapi/examples/resources/commons/resources/types/types/data.py +++ b/seed/fastapi/examples/commons/types/types/data.py @@ -7,7 +7,7 @@ import typing_extensions -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore @@ -27,7 +27,7 @@ def base_64(self, value: str) -> Data: class Data(pydantic.BaseModel): """ - from seed.examples.resources.commons import Data_String + from seed.examples.commons import Data_String Data_String(type="string", value="data") """ diff --git a/seed/fastapi/examples/resources/commons/resources/types/types/event_info.py b/seed/fastapi/examples/commons/types/types/event_info.py similarity index 67% rename from seed/fastapi/examples/resources/commons/resources/types/types/event_info.py rename to seed/fastapi/examples/commons/types/types/event_info.py index 5ad9098c7..c1b546237 100644 --- a/seed/fastapi/examples/resources/commons/resources/types/types/event_info.py +++ b/seed/fastapi/examples/commons/types/types/event_info.py @@ -7,9 +7,9 @@ import typing_extensions -from ......core.datetime_utils import serialize_datetime -from .metadata import Metadata as resources_commons_resources_types_types_metadata_Metadata -from .tag import Tag as resources_commons_resources_types_types_tag_Tag +from ....core.datetime_utils import serialize_datetime +from .metadata import Metadata as commons_types_types_metadata_Metadata +from .tag import Tag as commons_types_types_tag_Tag try: import pydantic.v1 as pydantic # type: ignore @@ -20,16 +20,16 @@ class _Factory: - def metadata(self, value: resources_commons_resources_types_types_metadata_Metadata) -> EventInfo: + def metadata(self, value: commons_types_types_metadata_Metadata) -> EventInfo: return EventInfo(__root__=_EventInfo.Metadata(**value.dict(exclude_unset=True), type="metadata")) - def tag(self, value: resources_commons_resources_types_types_tag_Tag) -> EventInfo: + def tag(self, value: commons_types_types_tag_Tag) -> EventInfo: return EventInfo(__root__=_EventInfo.Tag(type="tag", value=value)) class EventInfo(pydantic.BaseModel): """ - from seed.examples.resources.commons import EventInfo_Metadata + from seed.examples.commons import EventInfo_Metadata EventInfo_Metadata( type="metadata", @@ -46,14 +46,12 @@ def get_as_union(self) -> typing.Union[_EventInfo.Metadata, _EventInfo.Tag]: def visit( self, - metadata: typing.Callable[[resources_commons_resources_types_types_metadata_Metadata], T_Result], - tag: typing.Callable[[resources_commons_resources_types_types_tag_Tag], T_Result], + metadata: typing.Callable[[commons_types_types_metadata_Metadata], T_Result], + tag: typing.Callable[[commons_types_types_tag_Tag], T_Result], ) -> T_Result: if self.__root__.type == "metadata": return metadata( - resources_commons_resources_types_types_metadata_Metadata( - **self.__root__.dict(exclude_unset=True, exclude={"type"}) - ) + commons_types_types_metadata_Metadata(**self.__root__.dict(exclude_unset=True, exclude={"type"})) ) if self.__root__.type == "tag": return tag(self.__root__.value) @@ -76,7 +74,7 @@ class Config: class _EventInfo: - class Metadata(resources_commons_resources_types_types_metadata_Metadata): + class Metadata(commons_types_types_metadata_Metadata): type: typing_extensions.Literal["metadata"] class Config: @@ -84,7 +82,7 @@ class Config: class Tag(pydantic.BaseModel): type: typing_extensions.Literal["tag"] - value: resources_commons_resources_types_types_tag_Tag + value: commons_types_types_tag_Tag EventInfo.update_forward_refs() diff --git a/seed/fastapi/examples/resources/commons/resources/types/types/metadata.py b/seed/fastapi/examples/commons/types/types/metadata.py similarity index 90% rename from seed/fastapi/examples/resources/commons/resources/types/types/metadata.py rename to seed/fastapi/examples/commons/types/types/metadata.py index 23593ae01..28fd03dfb 100644 --- a/seed/fastapi/examples/resources/commons/resources/types/types/metadata.py +++ b/seed/fastapi/examples/commons/types/types/metadata.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore @@ -13,7 +13,7 @@ class Metadata(pydantic.BaseModel): """ - from seed.examples.resources.commons import Metadata + from seed.examples.commons import Metadata Metadata( id="metadata-js8dg24b", diff --git a/seed/fastapi/examples/resources/commons/resources/types/types/tag.py b/seed/fastapi/examples/commons/types/types/tag.py similarity index 94% rename from seed/fastapi/examples/resources/commons/resources/types/types/tag.py rename to seed/fastapi/examples/commons/types/types/tag.py index 311463a5d..5365721c5 100644 --- a/seed/fastapi/examples/resources/commons/resources/types/types/tag.py +++ b/seed/fastapi/examples/commons/types/types/tag.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/examples/resources/file/resources/__init__.py b/seed/fastapi/examples/file/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/file/resources/__init__.py rename to seed/fastapi/examples/file/__init__.py diff --git a/seed/fastapi/examples/resources/file/resources/notification/resources/service/__init__.py b/seed/fastapi/examples/file/notification/service/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/file/resources/notification/resources/service/__init__.py rename to seed/fastapi/examples/file/notification/service/__init__.py diff --git a/seed/fastapi/examples/resources/file/resources/notification/resources/service/service/__init__.py b/seed/fastapi/examples/file/notification/service/service/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/file/resources/notification/resources/service/service/__init__.py rename to seed/fastapi/examples/file/notification/service/service/__init__.py diff --git a/seed/fastapi/examples/resources/file/resources/notification/resources/service/service/service.py b/seed/fastapi/examples/file/notification/service/service/service.py similarity index 90% rename from seed/fastapi/examples/resources/file/resources/notification/resources/service/service/service.py rename to seed/fastapi/examples/file/notification/service/service/service.py index b5e33abaa..bd71bf819 100644 --- a/seed/fastapi/examples/resources/file/resources/notification/resources/service/service/service.py +++ b/seed/fastapi/examples/file/notification/service/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ........core.abstract_fern_service import AbstractFernService -from ........core.exceptions.fern_http_exception import FernHTTPException -from ........core.route_args import get_route_args -from ........security import ApiAuth, FernAuth -from .......types.types.exception import Exception +from .....core.abstract_fern_service import AbstractFernService +from .....core.exceptions.fern_http_exception import FernHTTPException +from .....core.route_args import get_route_args +from .....security import ApiAuth, FernAuth +from .....types.types.exception import Exception class AbstractFileNotificationServiceService(AbstractFernService): diff --git a/seed/fastapi/examples/resources/file/resources/service/__init__.py b/seed/fastapi/examples/file/service/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/file/resources/service/__init__.py rename to seed/fastapi/examples/file/service/__init__.py diff --git a/seed/fastapi/examples/resources/file/resources/service/service/__init__.py b/seed/fastapi/examples/file/service/service/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/file/resources/service/service/__init__.py rename to seed/fastapi/examples/file/service/service/__init__.py diff --git a/seed/fastapi/examples/resources/file/resources/service/service/service.py b/seed/fastapi/examples/file/service/service/service.py similarity index 89% rename from seed/fastapi/examples/resources/file/resources/service/service/service.py rename to seed/fastapi/examples/file/service/service/service.py index 9b70514c6..5b719d889 100644 --- a/seed/fastapi/examples/resources/file/resources/service/service/service.py +++ b/seed/fastapi/examples/file/service/service/service.py @@ -8,12 +8,12 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.errors.not_found_error import NotFoundError -from .....types.types.file import File +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.errors.not_found_error import NotFoundError +from ....types.types.file import File class AbstractFileServiceService(AbstractFernService): diff --git a/seed/fastapi/examples/resources/file/resources/service/types/__init__.py b/seed/fastapi/examples/file/service/types/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/file/resources/service/types/__init__.py rename to seed/fastapi/examples/file/service/types/__init__.py diff --git a/seed/fastapi/examples/resources/file/resources/service/types/filename.py b/seed/fastapi/examples/file/service/types/filename.py similarity index 94% rename from seed/fastapi/examples/resources/file/resources/service/types/filename.py rename to seed/fastapi/examples/file/service/types/filename.py index 90116c358..0636b2cf4 100644 --- a/seed/fastapi/examples/resources/file/resources/service/types/filename.py +++ b/seed/fastapi/examples/file/service/types/filename.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/examples/resources/health/resources/service/__init__.py b/seed/fastapi/examples/health/service/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/health/resources/service/__init__.py rename to seed/fastapi/examples/health/service/__init__.py diff --git a/seed/fastapi/examples/resources/health/resources/service/service/__init__.py b/seed/fastapi/examples/health/service/service/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/health/resources/service/service/__init__.py rename to seed/fastapi/examples/health/service/service/__init__.py diff --git a/seed/fastapi/examples/resources/health/resources/service/service/service.py b/seed/fastapi/examples/health/service/service/service.py similarity index 95% rename from seed/fastapi/examples/resources/health/resources/service/service/service.py rename to seed/fastapi/examples/health/service/service/service.py index 2279574a2..0410a36b2 100644 --- a/seed/fastapi/examples/resources/health/resources/service/service/service.py +++ b/seed/fastapi/examples/health/service/service/service.py @@ -9,10 +9,10 @@ import fastapi import starlette -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth class AbstractHealthServiceService(AbstractFernService): diff --git a/seed/fastapi/examples/register.py b/seed/fastapi/examples/register.py index 87e57bd05..77c7a8cb4 100644 --- a/seed/fastapi/examples/register.py +++ b/seed/fastapi/examples/register.py @@ -13,13 +13,11 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.file.resources.notification.resources.service.service.service import ( - AbstractFileNotificationServiceService, -) -from .resources.file.resources.service.service.service import AbstractFileServiceService -from .resources.health.resources.service.service.service import AbstractHealthServiceService -from .resources.service.service.service import AbstractServiceService +from .file.notification.service.service.service import AbstractFileNotificationServiceService +from .file.service.service.service import AbstractFileServiceService +from .health.service.service.service import AbstractHealthServiceService from .service.service import AbstractRootService +from .service.service.service import AbstractServiceService def register( diff --git a/seed/fastapi/examples/resources/__init__.py b/seed/fastapi/examples/resources/__init__.py deleted file mode 100644 index dfa09ba77..000000000 --- a/seed/fastapi/examples/resources/__init__.py +++ /dev/null @@ -1,53 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import commons, file, types -from .types import ( - Actor, - Actress, - CastMember, - Directory, - Exception, - ExceptionInfo, - ExtendedMovie, - File, - Metadata, - Migration, - MigrationStatus, - Moment, - Movie, - MovieId, - Node, - NotFoundError, - Request, - Response, - StuntDouble, - Test, - Tree, -) - -__all__ = [ - "Actor", - "Actress", - "CastMember", - "Directory", - "Exception", - "ExceptionInfo", - "ExtendedMovie", - "File", - "Metadata", - "Migration", - "MigrationStatus", - "Moment", - "Movie", - "MovieId", - "Node", - "NotFoundError", - "Request", - "Response", - "StuntDouble", - "Test", - "Tree", - "commons", - "file", - "types", -] diff --git a/seed/fastapi/examples/resources/commons/__init__.py b/seed/fastapi/examples/resources/commons/__init__.py deleted file mode 100644 index 6cb506f6c..000000000 --- a/seed/fastapi/examples/resources/commons/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import Data, EventInfo, Metadata, Tag, types - -__all__ = ["Data", "EventInfo", "Metadata", "Tag", "types"] diff --git a/seed/fastapi/examples/resources/file/__init__.py b/seed/fastapi/examples/resources/file/__init__.py deleted file mode 100644 index 000fc79d4..000000000 --- a/seed/fastapi/examples/resources/file/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import Filename, service - -__all__ = ["Filename", "service"] diff --git a/seed/fastapi/examples/resources/service/service/__init__.py b/seed/fastapi/examples/service/service/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/service/service/__init__.py rename to seed/fastapi/examples/service/service/__init__.py diff --git a/seed/fastapi/examples/resources/service/service/service.py b/seed/fastapi/examples/service/service/service.py similarity index 97% rename from seed/fastapi/examples/resources/service/service/service.py rename to seed/fastapi/examples/service/service/service.py index b0257bf7d..cddddf35f 100644 --- a/seed/fastapi/examples/resources/service/service/service.py +++ b/seed/fastapi/examples/service/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ...types.types.metadata import Metadata from ...types.types.movie import Movie from ...types.types.movie_id import MovieId diff --git a/seed/fastapi/examples/resources/types/__init__.py b/seed/fastapi/examples/types/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/types/__init__.py rename to seed/fastapi/examples/types/__init__.py diff --git a/seed/fastapi/examples/resources/types/errors/__init__.py b/seed/fastapi/examples/types/errors/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/types/errors/__init__.py rename to seed/fastapi/examples/types/errors/__init__.py diff --git a/seed/fastapi/folders/resources/folder/resources/service/errors/not_found_error.py b/seed/fastapi/examples/types/errors/not_found_error.py similarity index 75% rename from seed/fastapi/folders/resources/folder/resources/service/errors/not_found_error.py rename to seed/fastapi/examples/types/errors/not_found_error.py index 8745aba5f..124c48a4b 100644 --- a/seed/fastapi/folders/resources/folder/resources/service/errors/not_found_error.py +++ b/seed/fastapi/examples/types/errors/not_found_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ...core.exceptions.fern_http_exception import FernHTTPException class NotFoundError(FernHTTPException): diff --git a/seed/fastapi/examples/resources/types/types/__init__.py b/seed/fastapi/examples/types/types/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/types/types/__init__.py rename to seed/fastapi/examples/types/types/__init__.py diff --git a/seed/fastapi/examples/resources/types/types/actor.py b/seed/fastapi/examples/types/types/actor.py similarity index 93% rename from seed/fastapi/examples/resources/types/types/actor.py rename to seed/fastapi/examples/types/types/actor.py index 02f39ba95..200e2dc31 100644 --- a/seed/fastapi/examples/resources/types/types/actor.py +++ b/seed/fastapi/examples/types/types/actor.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/examples/resources/types/types/actress.py b/seed/fastapi/examples/types/types/actress.py similarity index 94% rename from seed/fastapi/examples/resources/types/types/actress.py rename to seed/fastapi/examples/types/types/actress.py index 22aeab76a..52fb472ca 100644 --- a/seed/fastapi/examples/resources/types/types/actress.py +++ b/seed/fastapi/examples/types/types/actress.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/examples/resources/types/types/cast_member.py b/seed/fastapi/examples/types/types/cast_member.py similarity index 100% rename from seed/fastapi/examples/resources/types/types/cast_member.py rename to seed/fastapi/examples/types/types/cast_member.py diff --git a/seed/fastapi/examples/resources/types/types/directory.py b/seed/fastapi/examples/types/types/directory.py similarity index 96% rename from seed/fastapi/examples/resources/types/types/directory.py rename to seed/fastapi/examples/types/types/directory.py index 460f2479e..091847e68 100644 --- a/seed/fastapi/examples/resources/types/types/directory.py +++ b/seed/fastapi/examples/types/types/directory.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .file import File try: diff --git a/seed/fastapi/examples/resources/types/types/exception.py b/seed/fastapi/examples/types/types/exception.py similarity index 97% rename from seed/fastapi/examples/resources/types/types/exception.py rename to seed/fastapi/examples/types/types/exception.py index 335eae7ea..522498a7f 100644 --- a/seed/fastapi/examples/resources/types/types/exception.py +++ b/seed/fastapi/examples/types/types/exception.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .exception_info import ExceptionInfo try: diff --git a/seed/fastapi/examples/resources/types/types/exception_info.py b/seed/fastapi/examples/types/types/exception_info.py similarity index 95% rename from seed/fastapi/examples/resources/types/types/exception_info.py rename to seed/fastapi/examples/types/types/exception_info.py index 87ecc7ca0..24c13bbf4 100644 --- a/seed/fastapi/examples/resources/types/types/exception_info.py +++ b/seed/fastapi/examples/types/types/exception_info.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/examples/resources/types/types/extended_movie.py b/seed/fastapi/examples/types/types/extended_movie.py similarity index 95% rename from seed/fastapi/examples/resources/types/types/extended_movie.py rename to seed/fastapi/examples/types/types/extended_movie.py index 50aae83cf..363df1bd9 100644 --- a/seed/fastapi/examples/resources/types/types/extended_movie.py +++ b/seed/fastapi/examples/types/types/extended_movie.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .movie import Movie try: diff --git a/seed/fastapi/examples/resources/types/types/file.py b/seed/fastapi/examples/types/types/file.py similarity index 94% rename from seed/fastapi/examples/resources/types/types/file.py rename to seed/fastapi/examples/types/types/file.py index d1273040e..56013c7bc 100644 --- a/seed/fastapi/examples/resources/types/types/file.py +++ b/seed/fastapi/examples/types/types/file.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/examples/resources/types/types/metadata.py b/seed/fastapi/examples/types/types/metadata.py similarity index 97% rename from seed/fastapi/examples/resources/types/types/metadata.py rename to seed/fastapi/examples/types/types/metadata.py index d67664eda..3e366a1d4 100644 --- a/seed/fastapi/examples/resources/types/types/metadata.py +++ b/seed/fastapi/examples/types/types/metadata.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/examples/resources/types/types/migration.py b/seed/fastapi/examples/types/types/migration.py similarity index 94% rename from seed/fastapi/examples/resources/types/types/migration.py rename to seed/fastapi/examples/types/types/migration.py index 2df1cbe23..4fba57308 100644 --- a/seed/fastapi/examples/resources/types/types/migration.py +++ b/seed/fastapi/examples/types/types/migration.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .migration_status import MigrationStatus try: diff --git a/seed/fastapi/examples/resources/types/types/migration_status.py b/seed/fastapi/examples/types/types/migration_status.py similarity index 100% rename from seed/fastapi/examples/resources/types/types/migration_status.py rename to seed/fastapi/examples/types/types/migration_status.py diff --git a/seed/fastapi/examples/resources/types/types/moment.py b/seed/fastapi/examples/types/types/moment.py similarity index 95% rename from seed/fastapi/examples/resources/types/types/moment.py rename to seed/fastapi/examples/types/types/moment.py index b3c5e32ac..d61d704c5 100644 --- a/seed/fastapi/examples/resources/types/types/moment.py +++ b/seed/fastapi/examples/types/types/moment.py @@ -4,7 +4,7 @@ import typing import uuid -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/examples/resources/types/types/movie.py b/seed/fastapi/examples/types/types/movie.py similarity index 92% rename from seed/fastapi/examples/resources/types/types/movie.py rename to seed/fastapi/examples/types/types/movie.py index 752177ee2..49fe61fba 100644 --- a/seed/fastapi/examples/resources/types/types/movie.py +++ b/seed/fastapi/examples/types/types/movie.py @@ -5,8 +5,8 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime -from ...commons.resources.types.types.tag import Tag +from ...commons.types.types.tag import Tag +from ...core.datetime_utils import serialize_datetime from .movie_id import MovieId try: diff --git a/seed/fastapi/examples/resources/types/types/movie_id.py b/seed/fastapi/examples/types/types/movie_id.py similarity index 94% rename from seed/fastapi/examples/resources/types/types/movie_id.py rename to seed/fastapi/examples/types/types/movie_id.py index a32617681..347dbf20e 100644 --- a/seed/fastapi/examples/resources/types/types/movie_id.py +++ b/seed/fastapi/examples/types/types/movie_id.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/examples/resources/types/types/node.py b/seed/fastapi/examples/types/types/node.py similarity index 96% rename from seed/fastapi/examples/resources/types/types/node.py rename to seed/fastapi/examples/types/types/node.py index b6d70b624..0e1be39f0 100644 --- a/seed/fastapi/examples/resources/types/types/node.py +++ b/seed/fastapi/examples/types/types/node.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/examples/resources/types/types/request.py b/seed/fastapi/examples/types/types/request.py similarity index 94% rename from seed/fastapi/examples/resources/types/types/request.py rename to seed/fastapi/examples/types/types/request.py index 2b8929d7a..d4b720f65 100644 --- a/seed/fastapi/examples/resources/types/types/request.py +++ b/seed/fastapi/examples/types/types/request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/examples/resources/types/types/response.py b/seed/fastapi/examples/types/types/response.py similarity index 94% rename from seed/fastapi/examples/resources/types/types/response.py rename to seed/fastapi/examples/types/types/response.py index a132f266d..d2f24d6da 100644 --- a/seed/fastapi/examples/resources/types/types/response.py +++ b/seed/fastapi/examples/types/types/response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/examples/resources/types/types/stunt_double.py b/seed/fastapi/examples/types/types/stunt_double.py similarity index 94% rename from seed/fastapi/examples/resources/types/types/stunt_double.py rename to seed/fastapi/examples/types/types/stunt_double.py index c7a097cd6..0eb8e3e8b 100644 --- a/seed/fastapi/examples/resources/types/types/stunt_double.py +++ b/seed/fastapi/examples/types/types/stunt_double.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/examples/resources/types/types/test.py b/seed/fastapi/examples/types/types/test.py similarity index 97% rename from seed/fastapi/examples/resources/types/types/test.py rename to seed/fastapi/examples/types/types/test.py index c2d46772a..fc72c8903 100644 --- a/seed/fastapi/examples/resources/types/types/test.py +++ b/seed/fastapi/examples/types/types/test.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/examples/resources/types/types/tree.py b/seed/fastapi/examples/types/types/tree.py similarity index 95% rename from seed/fastapi/examples/resources/types/types/tree.py rename to seed/fastapi/examples/types/types/tree.py index 8e1a1b696..af3e3730c 100644 --- a/seed/fastapi/examples/resources/types/types/tree.py +++ b/seed/fastapi/examples/types/types/tree.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/no-custom-config/__init__.py b/seed/fastapi/exhaustive/no-custom-config/__init__.py index 2679cde48..c2c85625a 100644 --- a/seed/fastapi/exhaustive/no-custom-config/__init__.py +++ b/seed/fastapi/exhaustive/no-custom-config/__init__.py @@ -1,6 +1,8 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import BadObjectRequestInfo, BadRequestBody, PostWithObjectBody, general_errors, inlined_requests, types +from . import general_errors, inlined_requests, types +from .general_errors import BadObjectRequestInfo, BadRequestBody +from .inlined_requests import PostWithObjectBody from .security import ApiAuth __all__ = [ diff --git a/seed/fastapi/examples/resources/service/__init__.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/container/__init__.py similarity index 100% rename from seed/fastapi/examples/resources/service/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/container/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/container/service/__init__.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/container/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/container/service/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/container/service/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/container/service/service.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/container/service/service.py similarity index 98% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/container/service/service.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/container/service/service.py index e49be01b4..f52a9c041 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/container/service/service.py +++ b/seed/fastapi/exhaustive/no-custom-config/endpoints/container/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.object.types.object_with_required_field import ObjectWithRequiredField class AbstractEndpointsContainerService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/container/__init__.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/enum/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/container/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/enum/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/enum/service/__init__.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/enum/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/enum/service/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/enum/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/enum/service/service.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/enum/service/service.py similarity index 90% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/enum/service/service.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/enum/service/service.py index a27999105..06273face 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/enum/service/service.py +++ b/seed/fastapi/exhaustive/no-custom-config/endpoints/enum/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.resources.enum.types.weather_report import WeatherReport +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.enum.types.weather_report import WeatherReport class AbstractEndpointsEnumService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/enum/__init__.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/http_methods/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/enum/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/http_methods/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/http_methods/service/__init__.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/http_methods/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/http_methods/service/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/http_methods/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/http_methods/service/service.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/http_methods/service/service.py similarity index 96% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/http_methods/service/service.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/http_methods/service/service.py index 4ec18085f..fa3c09d4d 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/http_methods/service/service.py +++ b/seed/fastapi/exhaustive/no-custom-config/endpoints/http_methods/service/service.py @@ -8,12 +8,12 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from .....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.object.types.object_with_optional_field import ObjectWithOptionalField +from ....types.object.types.object_with_required_field import ObjectWithRequiredField class AbstractEndpointsHttpMethodsService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/http_methods/__init__.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/object/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/http_methods/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/object/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/object/service/__init__.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/object/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/object/service/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/object/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/object/service/service.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/object/service/service.py similarity index 94% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/object/service/service.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/object/service/service.py index 21b405012..e40a3a411 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/object/service/service.py +++ b/seed/fastapi/exhaustive/no-custom-config/endpoints/object/service/service.py @@ -8,15 +8,15 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.resources.object.types.nested_object_with_optional_field import NestedObjectWithOptionalField -from .....types.resources.object.types.nested_object_with_required_field import NestedObjectWithRequiredField -from .....types.resources.object.types.object_with_map_of_map import ObjectWithMapOfMap -from .....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from .....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.object.types.nested_object_with_optional_field import NestedObjectWithOptionalField +from ....types.object.types.nested_object_with_required_field import NestedObjectWithRequiredField +from ....types.object.types.object_with_map_of_map import ObjectWithMapOfMap +from ....types.object.types.object_with_optional_field import ObjectWithOptionalField +from ....types.object.types.object_with_required_field import ObjectWithRequiredField class AbstractEndpointsObjectService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/object/__init__.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/params/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/object/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/params/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/params/service/__init__.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/params/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/params/service/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/params/service/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/params/service/service.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/params/service/service.py similarity index 98% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/params/service/service.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/params/service/service.py index 5c2262cc3..d69b3ef92 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/params/service/service.py +++ b/seed/fastapi/exhaustive/no-custom-config/endpoints/params/service/service.py @@ -9,10 +9,10 @@ import fastapi import starlette -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth class AbstractEndpointsParamsService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/params/__init__.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/primitive/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/params/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/primitive/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/primitive/service/__init__.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/primitive/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/primitive/service/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/primitive/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/primitive/service/service.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/primitive/service/service.py similarity index 98% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/primitive/service/service.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/primitive/service/service.py index db7ef4467..cdbee1327 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/primitive/service/service.py +++ b/seed/fastapi/exhaustive/no-custom-config/endpoints/primitive/service/service.py @@ -10,10 +10,10 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth class AbstractEndpointsPrimitiveService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/primitive/__init__.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/union/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/primitive/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/union/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/union/service/__init__.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/union/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/union/service/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/union/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/union/service/service.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/union/service/service.py similarity index 90% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/union/service/service.py rename to seed/fastapi/exhaustive/no-custom-config/endpoints/union/service/service.py index 5c026188a..0e86a046f 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/union/service/service.py +++ b/seed/fastapi/exhaustive/no-custom-config/endpoints/union/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.resources.union.types.animal import Animal +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.union.types.animal import Animal class AbstractEndpointsUnionService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/general_errors/__init__.py b/seed/fastapi/exhaustive/no-custom-config/general_errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/general_errors/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/general_errors/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/general_errors/errors/__init__.py b/seed/fastapi/exhaustive/no-custom-config/general_errors/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/general_errors/errors/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/general_errors/errors/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/general_errors/errors/bad_request_body.py b/seed/fastapi/exhaustive/no-custom-config/general_errors/errors/bad_request_body.py similarity index 81% rename from seed/fastapi/exhaustive/pydantic-v1/resources/general_errors/errors/bad_request_body.py rename to seed/fastapi/exhaustive/no-custom-config/general_errors/errors/bad_request_body.py index 9c75b4bcf..7001d2a4a 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/general_errors/errors/bad_request_body.py +++ b/seed/fastapi/exhaustive/no-custom-config/general_errors/errors/bad_request_body.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...core.exceptions.fern_http_exception import FernHTTPException from ..types.bad_object_request_info import BadObjectRequestInfo diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/general_errors/types/__init__.py b/seed/fastapi/exhaustive/no-custom-config/general_errors/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/general_errors/types/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/general_errors/types/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/general_errors/types/bad_object_request_info.py b/seed/fastapi/exhaustive/no-custom-config/general_errors/types/bad_object_request_info.py similarity index 93% rename from seed/fastapi/exhaustive/no-custom-config/resources/general_errors/types/bad_object_request_info.py rename to seed/fastapi/exhaustive/no-custom-config/general_errors/types/bad_object_request_info.py index 5ccb231d2..fb5f2bc3e 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/general_errors/types/bad_object_request_info.py +++ b/seed/fastapi/exhaustive/no-custom-config/general_errors/types/bad_object_request_info.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/inlined_requests/__init__.py b/seed/fastapi/exhaustive/no-custom-config/inlined_requests/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/inlined_requests/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/inlined_requests/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/inlined_requests/service/__init__.py b/seed/fastapi/exhaustive/no-custom-config/inlined_requests/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/inlined_requests/service/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/inlined_requests/service/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/inlined_requests/service/post_with_object_body.py b/seed/fastapi/exhaustive/no-custom-config/inlined_requests/service/post_with_object_body.py similarity index 86% rename from seed/fastapi/exhaustive/no-custom-config/resources/inlined_requests/service/post_with_object_body.py rename to seed/fastapi/exhaustive/no-custom-config/inlined_requests/service/post_with_object_body.py index 189cca946..20ee54b0c 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/inlined_requests/service/post_with_object_body.py +++ b/seed/fastapi/exhaustive/no-custom-config/inlined_requests/service/post_with_object_body.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ...core.datetime_utils import serialize_datetime +from ...types.object.types.object_with_optional_field import ObjectWithOptionalField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/inlined_requests/service/service.py b/seed/fastapi/exhaustive/no-custom-config/inlined_requests/service/service.py similarity index 92% rename from seed/fastapi/exhaustive/pydantic-v1/resources/inlined_requests/service/service.py rename to seed/fastapi/exhaustive/no-custom-config/inlined_requests/service/service.py index 24b6ac5ff..94ece8538 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/inlined_requests/service/service.py +++ b/seed/fastapi/exhaustive/no-custom-config/inlined_requests/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ...general_errors.errors.bad_request_body import BadRequestBody -from ...types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ...types.object.types.object_with_optional_field import ObjectWithOptionalField from .post_with_object_body import PostWithObjectBody diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/union/__init__.py b/seed/fastapi/exhaustive/no-custom-config/no_auth/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/union/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/no_auth/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/no_auth/service/__init__.py b/seed/fastapi/exhaustive/no-custom-config/no_auth/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/no_auth/service/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/no_auth/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/no_auth/service/service.py b/seed/fastapi/exhaustive/no-custom-config/no_auth/service/service.py similarity index 94% rename from seed/fastapi/exhaustive/pydantic-v1/resources/no_auth/service/service.py rename to seed/fastapi/exhaustive/no-custom-config/no_auth/service/service.py index 952a7322d..b6ce2af0e 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/no_auth/service/service.py +++ b/seed/fastapi/exhaustive/no-custom-config/no_auth/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ...general_errors.errors.bad_request_body import BadRequestBody diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/no_auth/__init__.py b/seed/fastapi/exhaustive/no-custom-config/no_req_body/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/no_auth/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/no_req_body/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/no_req_body/service/__init__.py b/seed/fastapi/exhaustive/no-custom-config/no_req_body/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/no_req_body/service/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/no_req_body/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/no_req_body/service/service.py b/seed/fastapi/exhaustive/no-custom-config/no_req_body/service/service.py similarity index 93% rename from seed/fastapi/exhaustive/pydantic-v1/resources/no_req_body/service/service.py rename to seed/fastapi/exhaustive/no-custom-config/no_req_body/service/service.py index 09c805cc1..22da12659 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/no_req_body/service/service.py +++ b/seed/fastapi/exhaustive/no-custom-config/no_req_body/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth -from ...types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args +from ...security import ApiAuth, FernAuth +from ...types.object.types.object_with_optional_field import ObjectWithOptionalField class AbstractNoReqBodyService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/no-custom-config/register.py b/seed/fastapi/exhaustive/no-custom-config/register.py index fc7047bb2..85d01519a 100644 --- a/seed/fastapi/exhaustive/no-custom-config/register.py +++ b/seed/fastapi/exhaustive/no-custom-config/register.py @@ -13,17 +13,17 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.endpoints.resources.container.service.service import AbstractEndpointsContainerService -from .resources.endpoints.resources.enum.service.service import AbstractEndpointsEnumService -from .resources.endpoints.resources.http_methods.service.service import AbstractEndpointsHttpMethodsService -from .resources.endpoints.resources.object.service.service import AbstractEndpointsObjectService -from .resources.endpoints.resources.params.service.service import AbstractEndpointsParamsService -from .resources.endpoints.resources.primitive.service.service import AbstractEndpointsPrimitiveService -from .resources.endpoints.resources.union.service.service import AbstractEndpointsUnionService -from .resources.inlined_requests.service.service import AbstractInlinedRequestsService -from .resources.no_auth.service.service import AbstractNoAuthService -from .resources.no_req_body.service.service import AbstractNoReqBodyService -from .resources.req_with_headers.service.service import AbstractReqWithHeadersService +from .endpoints.container.service.service import AbstractEndpointsContainerService +from .endpoints.enum.service.service import AbstractEndpointsEnumService +from .endpoints.http_methods.service.service import AbstractEndpointsHttpMethodsService +from .endpoints.object.service.service import AbstractEndpointsObjectService +from .endpoints.params.service.service import AbstractEndpointsParamsService +from .endpoints.primitive.service.service import AbstractEndpointsPrimitiveService +from .endpoints.union.service.service import AbstractEndpointsUnionService +from .inlined_requests.service.service import AbstractInlinedRequestsService +from .no_auth.service.service import AbstractNoAuthService +from .no_req_body.service.service import AbstractNoReqBodyService +from .req_with_headers.service.service import AbstractReqWithHeadersService def register( diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/no_req_body/__init__.py b/seed/fastapi/exhaustive/no-custom-config/req_with_headers/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/no_req_body/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/req_with_headers/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/req_with_headers/service/__init__.py b/seed/fastapi/exhaustive/no-custom-config/req_with_headers/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/req_with_headers/service/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/req_with_headers/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/req_with_headers/service/service.py b/seed/fastapi/exhaustive/no-custom-config/req_with_headers/service/service.py similarity index 93% rename from seed/fastapi/exhaustive/pydantic-v2/resources/req_with_headers/service/service.py rename to seed/fastapi/exhaustive/no-custom-config/req_with_headers/service/service.py index 7b31e8311..a898b99a3 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/req_with_headers/service/service.py +++ b/seed/fastapi/exhaustive/no-custom-config/req_with_headers/service/service.py @@ -9,10 +9,10 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args +from ...security import ApiAuth, FernAuth class AbstractReqWithHeadersService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/__init__.py b/seed/fastapi/exhaustive/no-custom-config/resources/__init__.py deleted file mode 100644 index 29cd28565..000000000 --- a/seed/fastapi/exhaustive/no-custom-config/resources/__init__.py +++ /dev/null @@ -1,14 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import general_errors, inlined_requests, types -from .general_errors import BadObjectRequestInfo, BadRequestBody -from .inlined_requests import PostWithObjectBody - -__all__ = [ - "BadObjectRequestInfo", - "BadRequestBody", - "PostWithObjectBody", - "general_errors", - "inlined_requests", - "types", -] diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/__init__.py b/seed/fastapi/exhaustive/no-custom-config/resources/types/__init__.py deleted file mode 100644 index a1bb4ed73..000000000 --- a/seed/fastapi/exhaustive/no-custom-config/resources/types/__init__.py +++ /dev/null @@ -1,43 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import ( - Animal, - Cat, - Dog, - ErrorWithEnumBody, - ErrorWithUnionBody, - NestedObjectWithOptionalField, - NestedObjectWithOptionalFieldError, - NestedObjectWithRequiredField, - NestedObjectWithRequiredFieldError, - ObjectWithMapOfMap, - ObjectWithOptionalField, - ObjectWithOptionalFieldError, - ObjectWithRequiredField, - ObjectWithRequiredFieldError, - WeatherReport, - enum, - object, - union, -) - -__all__ = [ - "Animal", - "Cat", - "Dog", - "ErrorWithEnumBody", - "ErrorWithUnionBody", - "NestedObjectWithOptionalField", - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredField", - "NestedObjectWithRequiredFieldError", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredField", - "ObjectWithRequiredFieldError", - "WeatherReport", - "enum", - "object", - "union", -] diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/__init__.py b/seed/fastapi/exhaustive/no-custom-config/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/types/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/enum/__init__.py b/seed/fastapi/exhaustive/no-custom-config/types/enum/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/enum/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/types/enum/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/enum/errors/__init__.py b/seed/fastapi/exhaustive/no-custom-config/types/enum/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/enum/errors/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/types/enum/errors/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/enum/errors/error_with_enum_body.py b/seed/fastapi/exhaustive/no-custom-config/types/enum/errors/error_with_enum_body.py similarity index 80% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/enum/errors/error_with_enum_body.py rename to seed/fastapi/exhaustive/no-custom-config/types/enum/errors/error_with_enum_body.py index 8b8a0d981..e6a1a1e03 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/enum/errors/error_with_enum_body.py +++ b/seed/fastapi/exhaustive/no-custom-config/types/enum/errors/error_with_enum_body.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.weather_report import WeatherReport diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/enum/types/__init__.py b/seed/fastapi/exhaustive/no-custom-config/types/enum/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/enum/types/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/types/enum/types/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/enum/types/weather_report.py b/seed/fastapi/exhaustive/no-custom-config/types/enum/types/weather_report.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/enum/types/weather_report.py rename to seed/fastapi/exhaustive/no-custom-config/types/enum/types/weather_report.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/__init__.py b/seed/fastapi/exhaustive/no-custom-config/types/object/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/types/object/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/errors/__init__.py b/seed/fastapi/exhaustive/no-custom-config/types/object/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/errors/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/types/object/errors/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/errors/nested_object_with_optional_field_error.py b/seed/fastapi/exhaustive/no-custom-config/types/object/errors/nested_object_with_optional_field_error.py similarity index 83% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/errors/nested_object_with_optional_field_error.py rename to seed/fastapi/exhaustive/no-custom-config/types/object/errors/nested_object_with_optional_field_error.py index 3ba440b27..673694198 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/errors/nested_object_with_optional_field_error.py +++ b/seed/fastapi/exhaustive/no-custom-config/types/object/errors/nested_object_with_optional_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.nested_object_with_optional_field import NestedObjectWithOptionalField diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/errors/nested_object_with_required_field_error.py b/seed/fastapi/exhaustive/no-custom-config/types/object/errors/nested_object_with_required_field_error.py similarity index 83% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/errors/nested_object_with_required_field_error.py rename to seed/fastapi/exhaustive/no-custom-config/types/object/errors/nested_object_with_required_field_error.py index 10b5e8500..0dee308fe 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/errors/nested_object_with_required_field_error.py +++ b/seed/fastapi/exhaustive/no-custom-config/types/object/errors/nested_object_with_required_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.nested_object_with_required_field import NestedObjectWithRequiredField diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/errors/object_with_optional_field_error.py b/seed/fastapi/exhaustive/no-custom-config/types/object/errors/object_with_optional_field_error.py similarity index 82% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/errors/object_with_optional_field_error.py rename to seed/fastapi/exhaustive/no-custom-config/types/object/errors/object_with_optional_field_error.py index 09a92f4c4..6590b1f10 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/errors/object_with_optional_field_error.py +++ b/seed/fastapi/exhaustive/no-custom-config/types/object/errors/object_with_optional_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.object_with_optional_field import ObjectWithOptionalField diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/errors/object_with_required_field_error.py b/seed/fastapi/exhaustive/no-custom-config/types/object/errors/object_with_required_field_error.py similarity index 82% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/errors/object_with_required_field_error.py rename to seed/fastapi/exhaustive/no-custom-config/types/object/errors/object_with_required_field_error.py index c0c5cc118..c0601c7c2 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/errors/object_with_required_field_error.py +++ b/seed/fastapi/exhaustive/no-custom-config/types/object/errors/object_with_required_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.object_with_required_field import ObjectWithRequiredField diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/__init__.py b/seed/fastapi/exhaustive/no-custom-config/types/object/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/types/object/types/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/nested_object_with_optional_field.py b/seed/fastapi/exhaustive/no-custom-config/types/object/types/nested_object_with_optional_field.py similarity index 94% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/nested_object_with_optional_field.py rename to seed/fastapi/exhaustive/no-custom-config/types/object/types/nested_object_with_optional_field.py index 4b3da46a7..b23c9d484 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/nested_object_with_optional_field.py +++ b/seed/fastapi/exhaustive/no-custom-config/types/object/types/nested_object_with_optional_field.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField try: diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/nested_object_with_required_field.py b/seed/fastapi/exhaustive/no-custom-config/types/object/types/nested_object_with_required_field.py similarity index 94% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/nested_object_with_required_field.py rename to seed/fastapi/exhaustive/no-custom-config/types/object/types/nested_object_with_required_field.py index 11fd6658c..cd8ee6ea3 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/nested_object_with_required_field.py +++ b/seed/fastapi/exhaustive/no-custom-config/types/object/types/nested_object_with_required_field.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField try: diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/object_with_map_of_map.py b/seed/fastapi/exhaustive/no-custom-config/types/object/types/object_with_map_of_map.py similarity index 93% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/object_with_map_of_map.py rename to seed/fastapi/exhaustive/no-custom-config/types/object/types/object_with_map_of_map.py index 231008fd8..4f2af9b7b 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/object_with_map_of_map.py +++ b/seed/fastapi/exhaustive/no-custom-config/types/object/types/object_with_map_of_map.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/object_with_optional_field.py b/seed/fastapi/exhaustive/no-custom-config/types/object/types/object_with_optional_field.py similarity index 95% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/object_with_optional_field.py rename to seed/fastapi/exhaustive/no-custom-config/types/object/types/object_with_optional_field.py index e175fd278..9ae8e7c60 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/object_with_optional_field.py +++ b/seed/fastapi/exhaustive/no-custom-config/types/object/types/object_with_optional_field.py @@ -4,7 +4,7 @@ import typing import uuid -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/object_with_required_field.py b/seed/fastapi/exhaustive/no-custom-config/types/object/types/object_with_required_field.py similarity index 93% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/object_with_required_field.py rename to seed/fastapi/exhaustive/no-custom-config/types/object/types/object_with_required_field.py index 6af246052..779f618f5 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/object/types/object_with_required_field.py +++ b/seed/fastapi/exhaustive/no-custom-config/types/object/types/object_with_required_field.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/__init__.py b/seed/fastapi/exhaustive/no-custom-config/types/union/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/types/union/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/errors/__init__.py b/seed/fastapi/exhaustive/no-custom-config/types/union/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/errors/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/types/union/errors/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/errors/error_with_union_body.py b/seed/fastapi/exhaustive/no-custom-config/types/union/errors/error_with_union_body.py similarity index 78% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/errors/error_with_union_body.py rename to seed/fastapi/exhaustive/no-custom-config/types/union/errors/error_with_union_body.py index d4343a0ae..4c69d4c14 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/errors/error_with_union_body.py +++ b/seed/fastapi/exhaustive/no-custom-config/types/union/errors/error_with_union_body.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.animal import Animal diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/types/__init__.py b/seed/fastapi/exhaustive/no-custom-config/types/union/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/types/__init__.py rename to seed/fastapi/exhaustive/no-custom-config/types/union/types/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/types/animal.py b/seed/fastapi/exhaustive/no-custom-config/types/union/types/animal.py similarity index 62% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/types/animal.py rename to seed/fastapi/exhaustive/no-custom-config/types/union/types/animal.py index a8cc37d71..b9dedbe30 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/types/animal.py +++ b/seed/fastapi/exhaustive/no-custom-config/types/union/types/animal.py @@ -7,9 +7,9 @@ import typing_extensions -from ......core.datetime_utils import serialize_datetime -from .cat import Cat as resources_types_resources_union_types_cat_Cat -from .dog import Dog as resources_types_resources_union_types_dog_Dog +from ....core.datetime_utils import serialize_datetime +from .cat import Cat as types_union_types_cat_Cat +from .dog import Dog as types_union_types_dog_Dog try: import pydantic.v1 as pydantic # type: ignore @@ -20,10 +20,10 @@ class _Factory: - def dog(self, value: resources_types_resources_union_types_dog_Dog) -> Animal: + def dog(self, value: types_union_types_dog_Dog) -> Animal: return Animal(__root__=_Animal.Dog(**value.dict(exclude_unset=True), animal="dog")) - def cat(self, value: resources_types_resources_union_types_cat_Cat) -> Animal: + def cat(self, value: types_union_types_cat_Cat) -> Animal: return Animal(__root__=_Animal.Cat(**value.dict(exclude_unset=True), animal="cat")) @@ -35,21 +35,13 @@ def get_as_union(self) -> typing.Union[_Animal.Dog, _Animal.Cat]: def visit( self, - dog: typing.Callable[[resources_types_resources_union_types_dog_Dog], T_Result], - cat: typing.Callable[[resources_types_resources_union_types_cat_Cat], T_Result], + dog: typing.Callable[[types_union_types_dog_Dog], T_Result], + cat: typing.Callable[[types_union_types_cat_Cat], T_Result], ) -> T_Result: if self.__root__.animal == "dog": - return dog( - resources_types_resources_union_types_dog_Dog( - **self.__root__.dict(exclude_unset=True, exclude={"animal"}) - ) - ) + return dog(types_union_types_dog_Dog(**self.__root__.dict(exclude_unset=True, exclude={"animal"}))) if self.__root__.animal == "cat": - return cat( - resources_types_resources_union_types_cat_Cat( - **self.__root__.dict(exclude_unset=True, exclude={"animal"}) - ) - ) + return cat(types_union_types_cat_Cat(**self.__root__.dict(exclude_unset=True, exclude={"animal"}))) __root__: typing_extensions.Annotated[ typing.Union[_Animal.Dog, _Animal.Cat], pydantic.Field(discriminator="animal") @@ -69,13 +61,13 @@ class Config: class _Animal: - class Dog(resources_types_resources_union_types_dog_Dog): + class Dog(types_union_types_dog_Dog): animal: typing_extensions.Literal["dog"] class Config: allow_population_by_field_name = True - class Cat(resources_types_resources_union_types_cat_Cat): + class Cat(types_union_types_cat_Cat): animal: typing_extensions.Literal["cat"] class Config: diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/types/cat.py b/seed/fastapi/exhaustive/no-custom-config/types/union/types/cat.py similarity index 94% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/types/cat.py rename to seed/fastapi/exhaustive/no-custom-config/types/union/types/cat.py index 6c5731407..4523aa60f 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/types/cat.py +++ b/seed/fastapi/exhaustive/no-custom-config/types/union/types/cat.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/types/dog.py b/seed/fastapi/exhaustive/no-custom-config/types/union/types/dog.py similarity index 94% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/types/dog.py rename to seed/fastapi/exhaustive/no-custom-config/types/union/types/dog.py index 347aee550..06199b26b 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/types/dog.py +++ b/seed/fastapi/exhaustive/no-custom-config/types/union/types/dog.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/pydantic-v1/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/__init__.py index 2679cde48..c2c85625a 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/__init__.py +++ b/seed/fastapi/exhaustive/pydantic-v1/__init__.py @@ -1,6 +1,8 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import BadObjectRequestInfo, BadRequestBody, PostWithObjectBody, general_errors, inlined_requests, types +from . import general_errors, inlined_requests, types +from .general_errors import BadObjectRequestInfo, BadRequestBody +from .inlined_requests import PostWithObjectBody from .security import ApiAuth __all__ = [ diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/req_with_headers/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/container/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/no-custom-config/resources/req_with_headers/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/container/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/container/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/container/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/container/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/container/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/container/service/service.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/container/service/service.py similarity index 98% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/container/service/service.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/container/service/service.py index e49be01b4..f52a9c041 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/container/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v1/endpoints/container/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.object.types.object_with_required_field import ObjectWithRequiredField class AbstractEndpointsContainerService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/container/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/enum/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/container/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/enum/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/enum/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/enum/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/enum/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/enum/service/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/enum/service/service.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/enum/service/service.py similarity index 90% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/enum/service/service.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/enum/service/service.py index a27999105..06273face 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/enum/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v1/endpoints/enum/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.resources.enum.types.weather_report import WeatherReport +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.enum.types.weather_report import WeatherReport class AbstractEndpointsEnumService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/enum/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/http_methods/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/enum/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/http_methods/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/http_methods/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/http_methods/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/http_methods/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/http_methods/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/http_methods/service/service.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/http_methods/service/service.py similarity index 96% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/http_methods/service/service.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/http_methods/service/service.py index 4ec18085f..fa3c09d4d 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/http_methods/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v1/endpoints/http_methods/service/service.py @@ -8,12 +8,12 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from .....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.object.types.object_with_optional_field import ObjectWithOptionalField +from ....types.object.types.object_with_required_field import ObjectWithRequiredField class AbstractEndpointsHttpMethodsService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/http_methods/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/object/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/http_methods/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/object/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/object/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/object/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/object/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/object/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/object/service/service.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/object/service/service.py similarity index 94% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/object/service/service.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/object/service/service.py index 21b405012..e40a3a411 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/object/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v1/endpoints/object/service/service.py @@ -8,15 +8,15 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.resources.object.types.nested_object_with_optional_field import NestedObjectWithOptionalField -from .....types.resources.object.types.nested_object_with_required_field import NestedObjectWithRequiredField -from .....types.resources.object.types.object_with_map_of_map import ObjectWithMapOfMap -from .....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from .....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.object.types.nested_object_with_optional_field import NestedObjectWithOptionalField +from ....types.object.types.nested_object_with_required_field import NestedObjectWithRequiredField +from ....types.object.types.object_with_map_of_map import ObjectWithMapOfMap +from ....types.object.types.object_with_optional_field import ObjectWithOptionalField +from ....types.object.types.object_with_required_field import ObjectWithRequiredField class AbstractEndpointsObjectService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/object/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/params/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/object/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/params/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/params/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/params/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/params/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/params/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/params/service/service.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/params/service/service.py similarity index 98% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/params/service/service.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/params/service/service.py index 5c2262cc3..d69b3ef92 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/params/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v1/endpoints/params/service/service.py @@ -9,10 +9,10 @@ import fastapi import starlette -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth class AbstractEndpointsParamsService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/params/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/primitive/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/params/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/primitive/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/primitive/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/primitive/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/primitive/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/primitive/service/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/primitive/service/service.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/primitive/service/service.py similarity index 98% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/primitive/service/service.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/primitive/service/service.py index db7ef4467..cdbee1327 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/primitive/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v1/endpoints/primitive/service/service.py @@ -10,10 +10,10 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth class AbstractEndpointsPrimitiveService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/primitive/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/union/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/primitive/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/union/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/union/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/union/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/union/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/union/service/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/union/service/service.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/union/service/service.py similarity index 90% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/union/service/service.py rename to seed/fastapi/exhaustive/pydantic-v1/endpoints/union/service/service.py index 5c026188a..0e86a046f 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/union/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v1/endpoints/union/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.resources.union.types.animal import Animal +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.union.types.animal import Animal class AbstractEndpointsUnionService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/general_errors/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/general_errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/general_errors/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/general_errors/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/general_errors/errors/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/general_errors/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/general_errors/errors/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/general_errors/errors/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/general_errors/errors/bad_request_body.py b/seed/fastapi/exhaustive/pydantic-v1/general_errors/errors/bad_request_body.py similarity index 81% rename from seed/fastapi/exhaustive/no-custom-config/resources/general_errors/errors/bad_request_body.py rename to seed/fastapi/exhaustive/pydantic-v1/general_errors/errors/bad_request_body.py index 9c75b4bcf..7001d2a4a 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/general_errors/errors/bad_request_body.py +++ b/seed/fastapi/exhaustive/pydantic-v1/general_errors/errors/bad_request_body.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...core.exceptions.fern_http_exception import FernHTTPException from ..types.bad_object_request_info import BadObjectRequestInfo diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/general_errors/types/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/general_errors/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/general_errors/types/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/general_errors/types/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/general_errors/types/bad_object_request_info.py b/seed/fastapi/exhaustive/pydantic-v1/general_errors/types/bad_object_request_info.py similarity index 92% rename from seed/fastapi/exhaustive/pydantic-v1/resources/general_errors/types/bad_object_request_info.py rename to seed/fastapi/exhaustive/pydantic-v1/general_errors/types/bad_object_request_info.py index 50cfa40ca..9ab1ebce9 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/general_errors/types/bad_object_request_info.py +++ b/seed/fastapi/exhaustive/pydantic-v1/general_errors/types/bad_object_request_info.py @@ -5,7 +5,7 @@ import pydantic -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime class BadObjectRequestInfo(pydantic.BaseModel): diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/inlined_requests/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/inlined_requests/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/inlined_requests/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/inlined_requests/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/inlined_requests/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/inlined_requests/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/inlined_requests/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/inlined_requests/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/inlined_requests/service/post_with_object_body.py b/seed/fastapi/exhaustive/pydantic-v1/inlined_requests/service/post_with_object_body.py similarity index 85% rename from seed/fastapi/exhaustive/pydantic-v1/resources/inlined_requests/service/post_with_object_body.py rename to seed/fastapi/exhaustive/pydantic-v1/inlined_requests/service/post_with_object_body.py index 1ad901b62..d3fe85020 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/inlined_requests/service/post_with_object_body.py +++ b/seed/fastapi/exhaustive/pydantic-v1/inlined_requests/service/post_with_object_body.py @@ -5,8 +5,8 @@ import pydantic -from ....core.datetime_utils import serialize_datetime -from ...types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ...core.datetime_utils import serialize_datetime +from ...types.object.types.object_with_optional_field import ObjectWithOptionalField class PostWithObjectBody(pydantic.BaseModel): diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/inlined_requests/service/service.py b/seed/fastapi/exhaustive/pydantic-v1/inlined_requests/service/service.py similarity index 92% rename from seed/fastapi/exhaustive/pydantic-v2/resources/inlined_requests/service/service.py rename to seed/fastapi/exhaustive/pydantic-v1/inlined_requests/service/service.py index 24b6ac5ff..94ece8538 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/inlined_requests/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v1/inlined_requests/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ...general_errors.errors.bad_request_body import BadRequestBody -from ...types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ...types.object.types.object_with_optional_field import ObjectWithOptionalField from .post_with_object_body import PostWithObjectBody diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/union/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/no_auth/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/union/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/no_auth/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/no_auth/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/no_auth/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/no_auth/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/no_auth/service/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/no_auth/service/service.py b/seed/fastapi/exhaustive/pydantic-v1/no_auth/service/service.py similarity index 94% rename from seed/fastapi/exhaustive/no-custom-config/resources/no_auth/service/service.py rename to seed/fastapi/exhaustive/pydantic-v1/no_auth/service/service.py index 952a7322d..b6ce2af0e 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/no_auth/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v1/no_auth/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ...general_errors.errors.bad_request_body import BadRequestBody diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/no_auth/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/no_req_body/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/no_auth/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/no_req_body/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/no_req_body/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/no_req_body/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/no_req_body/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/no_req_body/service/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/no_req_body/service/service.py b/seed/fastapi/exhaustive/pydantic-v1/no_req_body/service/service.py similarity index 93% rename from seed/fastapi/exhaustive/no-custom-config/resources/no_req_body/service/service.py rename to seed/fastapi/exhaustive/pydantic-v1/no_req_body/service/service.py index 09c805cc1..22da12659 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/no_req_body/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v1/no_req_body/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth -from ...types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args +from ...security import ApiAuth, FernAuth +from ...types.object.types.object_with_optional_field import ObjectWithOptionalField class AbstractNoReqBodyService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v1/register.py b/seed/fastapi/exhaustive/pydantic-v1/register.py index fc7047bb2..85d01519a 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/register.py +++ b/seed/fastapi/exhaustive/pydantic-v1/register.py @@ -13,17 +13,17 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.endpoints.resources.container.service.service import AbstractEndpointsContainerService -from .resources.endpoints.resources.enum.service.service import AbstractEndpointsEnumService -from .resources.endpoints.resources.http_methods.service.service import AbstractEndpointsHttpMethodsService -from .resources.endpoints.resources.object.service.service import AbstractEndpointsObjectService -from .resources.endpoints.resources.params.service.service import AbstractEndpointsParamsService -from .resources.endpoints.resources.primitive.service.service import AbstractEndpointsPrimitiveService -from .resources.endpoints.resources.union.service.service import AbstractEndpointsUnionService -from .resources.inlined_requests.service.service import AbstractInlinedRequestsService -from .resources.no_auth.service.service import AbstractNoAuthService -from .resources.no_req_body.service.service import AbstractNoReqBodyService -from .resources.req_with_headers.service.service import AbstractReqWithHeadersService +from .endpoints.container.service.service import AbstractEndpointsContainerService +from .endpoints.enum.service.service import AbstractEndpointsEnumService +from .endpoints.http_methods.service.service import AbstractEndpointsHttpMethodsService +from .endpoints.object.service.service import AbstractEndpointsObjectService +from .endpoints.params.service.service import AbstractEndpointsParamsService +from .endpoints.primitive.service.service import AbstractEndpointsPrimitiveService +from .endpoints.union.service.service import AbstractEndpointsUnionService +from .inlined_requests.service.service import AbstractInlinedRequestsService +from .no_auth.service.service import AbstractNoAuthService +from .no_req_body.service.service import AbstractNoReqBodyService +from .req_with_headers.service.service import AbstractReqWithHeadersService def register( diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/no_req_body/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/req_with_headers/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/no_req_body/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/req_with_headers/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/req_with_headers/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/req_with_headers/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/req_with_headers/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/req_with_headers/service/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/req_with_headers/service/service.py b/seed/fastapi/exhaustive/pydantic-v1/req_with_headers/service/service.py similarity index 93% rename from seed/fastapi/exhaustive/no-custom-config/resources/req_with_headers/service/service.py rename to seed/fastapi/exhaustive/pydantic-v1/req_with_headers/service/service.py index 7b31e8311..a898b99a3 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/req_with_headers/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v1/req_with_headers/service/service.py @@ -9,10 +9,10 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args +from ...security import ApiAuth, FernAuth class AbstractReqWithHeadersService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/resources/__init__.py deleted file mode 100644 index 29cd28565..000000000 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/__init__.py +++ /dev/null @@ -1,14 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import general_errors, inlined_requests, types -from .general_errors import BadObjectRequestInfo, BadRequestBody -from .inlined_requests import PostWithObjectBody - -__all__ = [ - "BadObjectRequestInfo", - "BadRequestBody", - "PostWithObjectBody", - "general_errors", - "inlined_requests", - "types", -] diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/resources/types/__init__.py deleted file mode 100644 index a1bb4ed73..000000000 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/types/__init__.py +++ /dev/null @@ -1,43 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import ( - Animal, - Cat, - Dog, - ErrorWithEnumBody, - ErrorWithUnionBody, - NestedObjectWithOptionalField, - NestedObjectWithOptionalFieldError, - NestedObjectWithRequiredField, - NestedObjectWithRequiredFieldError, - ObjectWithMapOfMap, - ObjectWithOptionalField, - ObjectWithOptionalFieldError, - ObjectWithRequiredField, - ObjectWithRequiredFieldError, - WeatherReport, - enum, - object, - union, -) - -__all__ = [ - "Animal", - "Cat", - "Dog", - "ErrorWithEnumBody", - "ErrorWithUnionBody", - "NestedObjectWithOptionalField", - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredField", - "NestedObjectWithRequiredFieldError", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredField", - "ObjectWithRequiredFieldError", - "WeatherReport", - "enum", - "object", - "union", -] diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/types/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/enum/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/types/enum/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/enum/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/types/enum/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/enum/errors/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/types/enum/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/enum/errors/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/types/enum/errors/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/enum/errors/error_with_enum_body.py b/seed/fastapi/exhaustive/pydantic-v1/types/enum/errors/error_with_enum_body.py similarity index 80% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/enum/errors/error_with_enum_body.py rename to seed/fastapi/exhaustive/pydantic-v1/types/enum/errors/error_with_enum_body.py index 8b8a0d981..e6a1a1e03 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/enum/errors/error_with_enum_body.py +++ b/seed/fastapi/exhaustive/pydantic-v1/types/enum/errors/error_with_enum_body.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.weather_report import WeatherReport diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/enum/types/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/types/enum/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/enum/types/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/types/enum/types/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/enum/types/weather_report.py b/seed/fastapi/exhaustive/pydantic-v1/types/enum/types/weather_report.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/enum/types/weather_report.py rename to seed/fastapi/exhaustive/pydantic-v1/types/enum/types/weather_report.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/types/object/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/types/object/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/errors/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/types/object/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/errors/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/types/object/errors/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/errors/nested_object_with_optional_field_error.py b/seed/fastapi/exhaustive/pydantic-v1/types/object/errors/nested_object_with_optional_field_error.py similarity index 83% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/errors/nested_object_with_optional_field_error.py rename to seed/fastapi/exhaustive/pydantic-v1/types/object/errors/nested_object_with_optional_field_error.py index 3ba440b27..673694198 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/errors/nested_object_with_optional_field_error.py +++ b/seed/fastapi/exhaustive/pydantic-v1/types/object/errors/nested_object_with_optional_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.nested_object_with_optional_field import NestedObjectWithOptionalField diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/errors/nested_object_with_required_field_error.py b/seed/fastapi/exhaustive/pydantic-v1/types/object/errors/nested_object_with_required_field_error.py similarity index 83% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/errors/nested_object_with_required_field_error.py rename to seed/fastapi/exhaustive/pydantic-v1/types/object/errors/nested_object_with_required_field_error.py index 10b5e8500..0dee308fe 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/errors/nested_object_with_required_field_error.py +++ b/seed/fastapi/exhaustive/pydantic-v1/types/object/errors/nested_object_with_required_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.nested_object_with_required_field import NestedObjectWithRequiredField diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/errors/object_with_optional_field_error.py b/seed/fastapi/exhaustive/pydantic-v1/types/object/errors/object_with_optional_field_error.py similarity index 82% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/errors/object_with_optional_field_error.py rename to seed/fastapi/exhaustive/pydantic-v1/types/object/errors/object_with_optional_field_error.py index 09a92f4c4..6590b1f10 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/errors/object_with_optional_field_error.py +++ b/seed/fastapi/exhaustive/pydantic-v1/types/object/errors/object_with_optional_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.object_with_optional_field import ObjectWithOptionalField diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/errors/object_with_required_field_error.py b/seed/fastapi/exhaustive/pydantic-v1/types/object/errors/object_with_required_field_error.py similarity index 82% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/errors/object_with_required_field_error.py rename to seed/fastapi/exhaustive/pydantic-v1/types/object/errors/object_with_required_field_error.py index c0c5cc118..c0601c7c2 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/errors/object_with_required_field_error.py +++ b/seed/fastapi/exhaustive/pydantic-v1/types/object/errors/object_with_required_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.object_with_required_field import ObjectWithRequiredField diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/types/object/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/types/object/types/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/nested_object_with_optional_field.py b/seed/fastapi/exhaustive/pydantic-v1/types/object/types/nested_object_with_optional_field.py similarity index 94% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/nested_object_with_optional_field.py rename to seed/fastapi/exhaustive/pydantic-v1/types/object/types/nested_object_with_optional_field.py index e69e3a549..8f272e9d9 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/nested_object_with_optional_field.py +++ b/seed/fastapi/exhaustive/pydantic-v1/types/object/types/nested_object_with_optional_field.py @@ -5,7 +5,7 @@ import pydantic -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/nested_object_with_required_field.py b/seed/fastapi/exhaustive/pydantic-v1/types/object/types/nested_object_with_required_field.py similarity index 94% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/nested_object_with_required_field.py rename to seed/fastapi/exhaustive/pydantic-v1/types/object/types/nested_object_with_required_field.py index f01be47a0..345f7632a 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/nested_object_with_required_field.py +++ b/seed/fastapi/exhaustive/pydantic-v1/types/object/types/nested_object_with_required_field.py @@ -5,7 +5,7 @@ import pydantic -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/object_with_map_of_map.py b/seed/fastapi/exhaustive/pydantic-v1/types/object/types/object_with_map_of_map.py similarity index 92% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/object_with_map_of_map.py rename to seed/fastapi/exhaustive/pydantic-v1/types/object/types/object_with_map_of_map.py index a3e77c375..c41108921 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/object_with_map_of_map.py +++ b/seed/fastapi/exhaustive/pydantic-v1/types/object/types/object_with_map_of_map.py @@ -5,7 +5,7 @@ import pydantic -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime class ObjectWithMapOfMap(pydantic.BaseModel): diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/object_with_optional_field.py b/seed/fastapi/exhaustive/pydantic-v1/types/object/types/object_with_optional_field.py similarity index 95% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/object_with_optional_field.py rename to seed/fastapi/exhaustive/pydantic-v1/types/object/types/object_with_optional_field.py index 6706245a3..4a5e0ec9a 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/object_with_optional_field.py +++ b/seed/fastapi/exhaustive/pydantic-v1/types/object/types/object_with_optional_field.py @@ -6,7 +6,7 @@ import pydantic -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime class ObjectWithOptionalField(pydantic.BaseModel): diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/object_with_required_field.py b/seed/fastapi/exhaustive/pydantic-v1/types/object/types/object_with_required_field.py similarity index 92% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/object_with_required_field.py rename to seed/fastapi/exhaustive/pydantic-v1/types/object/types/object_with_required_field.py index 04ee9e688..e112747c4 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/object/types/object_with_required_field.py +++ b/seed/fastapi/exhaustive/pydantic-v1/types/object/types/object_with_required_field.py @@ -5,7 +5,7 @@ import pydantic -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime class ObjectWithRequiredField(pydantic.BaseModel): diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/types/union/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/types/union/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/errors/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/types/union/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/errors/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/types/union/errors/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/errors/error_with_union_body.py b/seed/fastapi/exhaustive/pydantic-v1/types/union/errors/error_with_union_body.py similarity index 78% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/errors/error_with_union_body.py rename to seed/fastapi/exhaustive/pydantic-v1/types/union/errors/error_with_union_body.py index d4343a0ae..4c69d4c14 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/errors/error_with_union_body.py +++ b/seed/fastapi/exhaustive/pydantic-v1/types/union/errors/error_with_union_body.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.animal import Animal diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/types/__init__.py b/seed/fastapi/exhaustive/pydantic-v1/types/union/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/types/__init__.py rename to seed/fastapi/exhaustive/pydantic-v1/types/union/types/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/types/animal.py b/seed/fastapi/exhaustive/pydantic-v1/types/union/types/animal.py similarity index 61% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/types/animal.py rename to seed/fastapi/exhaustive/pydantic-v1/types/union/types/animal.py index 27d15a292..8458b9bb3 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/types/animal.py +++ b/seed/fastapi/exhaustive/pydantic-v1/types/union/types/animal.py @@ -8,18 +8,18 @@ import pydantic import typing_extensions -from ......core.datetime_utils import serialize_datetime -from .cat import Cat as resources_types_resources_union_types_cat_Cat -from .dog import Dog as resources_types_resources_union_types_dog_Dog +from ....core.datetime_utils import serialize_datetime +from .cat import Cat as types_union_types_cat_Cat +from .dog import Dog as types_union_types_dog_Dog T_Result = typing.TypeVar("T_Result") class _Factory: - def dog(self, value: resources_types_resources_union_types_dog_Dog) -> Animal: + def dog(self, value: types_union_types_dog_Dog) -> Animal: return Animal(__root__=_Animal.Dog(**value.dict(exclude_unset=True), animal="dog")) - def cat(self, value: resources_types_resources_union_types_cat_Cat) -> Animal: + def cat(self, value: types_union_types_cat_Cat) -> Animal: return Animal(__root__=_Animal.Cat(**value.dict(exclude_unset=True), animal="cat")) @@ -31,21 +31,13 @@ def get_as_union(self) -> typing.Union[_Animal.Dog, _Animal.Cat]: def visit( self, - dog: typing.Callable[[resources_types_resources_union_types_dog_Dog], T_Result], - cat: typing.Callable[[resources_types_resources_union_types_cat_Cat], T_Result], + dog: typing.Callable[[types_union_types_dog_Dog], T_Result], + cat: typing.Callable[[types_union_types_cat_Cat], T_Result], ) -> T_Result: if self.__root__.animal == "dog": - return dog( - resources_types_resources_union_types_dog_Dog( - **self.__root__.dict(exclude_unset=True, exclude={"animal"}) - ) - ) + return dog(types_union_types_dog_Dog(**self.__root__.dict(exclude_unset=True, exclude={"animal"}))) if self.__root__.animal == "cat": - return cat( - resources_types_resources_union_types_cat_Cat( - **self.__root__.dict(exclude_unset=True, exclude={"animal"}) - ) - ) + return cat(types_union_types_cat_Cat(**self.__root__.dict(exclude_unset=True, exclude={"animal"}))) __root__: typing_extensions.Annotated[ typing.Union[_Animal.Dog, _Animal.Cat], pydantic.Field(discriminator="animal") @@ -65,13 +57,13 @@ class Config: class _Animal: - class Dog(resources_types_resources_union_types_dog_Dog): + class Dog(types_union_types_dog_Dog): animal: typing_extensions.Literal["dog"] class Config: allow_population_by_field_name = True - class Cat(resources_types_resources_union_types_cat_Cat): + class Cat(types_union_types_cat_Cat): animal: typing_extensions.Literal["cat"] class Config: diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/types/cat.py b/seed/fastapi/exhaustive/pydantic-v1/types/union/types/cat.py similarity index 93% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/types/cat.py rename to seed/fastapi/exhaustive/pydantic-v1/types/union/types/cat.py index f46c56687..028649ed1 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/types/cat.py +++ b/seed/fastapi/exhaustive/pydantic-v1/types/union/types/cat.py @@ -5,7 +5,7 @@ import pydantic -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime class Cat(pydantic.BaseModel): diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/types/dog.py b/seed/fastapi/exhaustive/pydantic-v1/types/union/types/dog.py similarity index 93% rename from seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/types/dog.py rename to seed/fastapi/exhaustive/pydantic-v1/types/union/types/dog.py index d48f673f9..31ca71242 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/types/resources/union/types/dog.py +++ b/seed/fastapi/exhaustive/pydantic-v1/types/union/types/dog.py @@ -5,7 +5,7 @@ import pydantic -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime class Dog(pydantic.BaseModel): diff --git a/seed/fastapi/exhaustive/pydantic-v2/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/__init__.py index 2679cde48..c2c85625a 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/__init__.py +++ b/seed/fastapi/exhaustive/pydantic-v2/__init__.py @@ -1,6 +1,8 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import BadObjectRequestInfo, BadRequestBody, PostWithObjectBody, general_errors, inlined_requests, types +from . import general_errors, inlined_requests, types +from .general_errors import BadObjectRequestInfo, BadRequestBody +from .inlined_requests import PostWithObjectBody from .security import ApiAuth __all__ = [ diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/req_with_headers/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/container/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v1/resources/req_with_headers/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/container/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/container/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/container/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/container/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/container/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/container/service/service.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/container/service/service.py similarity index 98% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/container/service/service.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/container/service/service.py index e49be01b4..f52a9c041 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/container/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v2/endpoints/container/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.object.types.object_with_required_field import ObjectWithRequiredField class AbstractEndpointsContainerService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/container/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/enum/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/container/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/enum/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/enum/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/enum/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/enum/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/enum/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/enum/service/service.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/enum/service/service.py similarity index 90% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/enum/service/service.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/enum/service/service.py index a27999105..06273face 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/enum/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v2/endpoints/enum/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.resources.enum.types.weather_report import WeatherReport +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.enum.types.weather_report import WeatherReport class AbstractEndpointsEnumService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/enum/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/http_methods/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/enum/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/http_methods/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/http_methods/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/http_methods/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/http_methods/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/http_methods/service/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/http_methods/service/service.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/http_methods/service/service.py similarity index 96% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/http_methods/service/service.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/http_methods/service/service.py index 4ec18085f..fa3c09d4d 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/http_methods/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v2/endpoints/http_methods/service/service.py @@ -8,12 +8,12 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from .....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.object.types.object_with_optional_field import ObjectWithOptionalField +from ....types.object.types.object_with_required_field import ObjectWithRequiredField class AbstractEndpointsHttpMethodsService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/http_methods/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/object/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/http_methods/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/object/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/object/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/object/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/object/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/object/service/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/object/service/service.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/object/service/service.py similarity index 94% rename from seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/object/service/service.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/object/service/service.py index 21b405012..e40a3a411 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/endpoints/resources/object/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v2/endpoints/object/service/service.py @@ -8,15 +8,15 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.resources.object.types.nested_object_with_optional_field import NestedObjectWithOptionalField -from .....types.resources.object.types.nested_object_with_required_field import NestedObjectWithRequiredField -from .....types.resources.object.types.object_with_map_of_map import ObjectWithMapOfMap -from .....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from .....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.object.types.nested_object_with_optional_field import NestedObjectWithOptionalField +from ....types.object.types.nested_object_with_required_field import NestedObjectWithRequiredField +from ....types.object.types.object_with_map_of_map import ObjectWithMapOfMap +from ....types.object.types.object_with_optional_field import ObjectWithOptionalField +from ....types.object.types.object_with_required_field import ObjectWithRequiredField class AbstractEndpointsObjectService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/object/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/params/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/object/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/params/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/params/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/params/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/params/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/params/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/params/service/service.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/params/service/service.py similarity index 98% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/params/service/service.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/params/service/service.py index 5c2262cc3..d69b3ef92 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/params/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v2/endpoints/params/service/service.py @@ -9,10 +9,10 @@ import fastapi import starlette -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth class AbstractEndpointsParamsService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/params/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/primitive/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/params/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/primitive/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/primitive/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/primitive/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/primitive/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/primitive/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/primitive/service/service.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/primitive/service/service.py similarity index 98% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/primitive/service/service.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/primitive/service/service.py index db7ef4467..cdbee1327 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/primitive/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v2/endpoints/primitive/service/service.py @@ -10,10 +10,10 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth class AbstractEndpointsPrimitiveService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/primitive/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/union/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/primitive/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/union/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/union/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/union/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/union/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/union/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/union/service/service.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/union/service/service.py similarity index 90% rename from seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/union/service/service.py rename to seed/fastapi/exhaustive/pydantic-v2/endpoints/union/service/service.py index 5c026188a..0e86a046f 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/endpoints/resources/union/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v2/endpoints/union/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args -from ......security import ApiAuth, FernAuth -from .....types.resources.union.types.animal import Animal +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args +from ....security import ApiAuth, FernAuth +from ....types.union.types.animal import Animal class AbstractEndpointsUnionService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/general_errors/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/general_errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/general_errors/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/general_errors/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/general_errors/errors/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/general_errors/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/general_errors/errors/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/general_errors/errors/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/general_errors/errors/bad_request_body.py b/seed/fastapi/exhaustive/pydantic-v2/general_errors/errors/bad_request_body.py similarity index 81% rename from seed/fastapi/exhaustive/pydantic-v2/resources/general_errors/errors/bad_request_body.py rename to seed/fastapi/exhaustive/pydantic-v2/general_errors/errors/bad_request_body.py index 9c75b4bcf..7001d2a4a 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/general_errors/errors/bad_request_body.py +++ b/seed/fastapi/exhaustive/pydantic-v2/general_errors/errors/bad_request_body.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...core.exceptions.fern_http_exception import FernHTTPException from ..types.bad_object_request_info import BadObjectRequestInfo diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/general_errors/types/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/general_errors/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/general_errors/types/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/general_errors/types/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/general_errors/types/bad_object_request_info.py b/seed/fastapi/exhaustive/pydantic-v2/general_errors/types/bad_object_request_info.py similarity index 93% rename from seed/fastapi/exhaustive/pydantic-v2/resources/general_errors/types/bad_object_request_info.py rename to seed/fastapi/exhaustive/pydantic-v2/general_errors/types/bad_object_request_info.py index 438a7d678..71d8ee4bf 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/general_errors/types/bad_object_request_info.py +++ b/seed/fastapi/exhaustive/pydantic-v2/general_errors/types/bad_object_request_info.py @@ -5,7 +5,7 @@ import pydantic.v1 as pydantic -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime class BadObjectRequestInfo(pydantic.BaseModel): diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/inlined_requests/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/inlined_requests/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/inlined_requests/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/inlined_requests/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/inlined_requests/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/inlined_requests/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/inlined_requests/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/inlined_requests/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/inlined_requests/service/post_with_object_body.py b/seed/fastapi/exhaustive/pydantic-v2/inlined_requests/service/post_with_object_body.py similarity index 85% rename from seed/fastapi/exhaustive/pydantic-v2/resources/inlined_requests/service/post_with_object_body.py rename to seed/fastapi/exhaustive/pydantic-v2/inlined_requests/service/post_with_object_body.py index 5ef7a886b..9370162b4 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/inlined_requests/service/post_with_object_body.py +++ b/seed/fastapi/exhaustive/pydantic-v2/inlined_requests/service/post_with_object_body.py @@ -5,8 +5,8 @@ import pydantic.v1 as pydantic -from ....core.datetime_utils import serialize_datetime -from ...types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ...core.datetime_utils import serialize_datetime +from ...types.object.types.object_with_optional_field import ObjectWithOptionalField class PostWithObjectBody(pydantic.BaseModel): diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/inlined_requests/service/service.py b/seed/fastapi/exhaustive/pydantic-v2/inlined_requests/service/service.py similarity index 92% rename from seed/fastapi/exhaustive/no-custom-config/resources/inlined_requests/service/service.py rename to seed/fastapi/exhaustive/pydantic-v2/inlined_requests/service/service.py index 24b6ac5ff..94ece8538 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/inlined_requests/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v2/inlined_requests/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ...general_errors.errors.bad_request_body import BadRequestBody -from ...types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ...types.object.types.object_with_optional_field import ObjectWithOptionalField from .post_with_object_body import PostWithObjectBody diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/union/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/no_auth/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/endpoints/resources/union/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/no_auth/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/no_auth/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/no_auth/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/no_auth/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/no_auth/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/no_auth/service/service.py b/seed/fastapi/exhaustive/pydantic-v2/no_auth/service/service.py similarity index 94% rename from seed/fastapi/exhaustive/pydantic-v2/resources/no_auth/service/service.py rename to seed/fastapi/exhaustive/pydantic-v2/no_auth/service/service.py index 952a7322d..b6ce2af0e 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/no_auth/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v2/no_auth/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ...general_errors.errors.bad_request_body import BadRequestBody diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/no_auth/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/no_req_body/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/no_auth/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/no_req_body/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/no_req_body/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/no_req_body/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/no_req_body/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/no_req_body/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/no_req_body/service/service.py b/seed/fastapi/exhaustive/pydantic-v2/no_req_body/service/service.py similarity index 93% rename from seed/fastapi/exhaustive/pydantic-v2/resources/no_req_body/service/service.py rename to seed/fastapi/exhaustive/pydantic-v2/no_req_body/service/service.py index 09c805cc1..22da12659 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/no_req_body/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v2/no_req_body/service/service.py @@ -8,11 +8,11 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth -from ...types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args +from ...security import ApiAuth, FernAuth +from ...types.object.types.object_with_optional_field import ObjectWithOptionalField class AbstractNoReqBodyService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v2/register.py b/seed/fastapi/exhaustive/pydantic-v2/register.py index fc7047bb2..85d01519a 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/register.py +++ b/seed/fastapi/exhaustive/pydantic-v2/register.py @@ -13,17 +13,17 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.endpoints.resources.container.service.service import AbstractEndpointsContainerService -from .resources.endpoints.resources.enum.service.service import AbstractEndpointsEnumService -from .resources.endpoints.resources.http_methods.service.service import AbstractEndpointsHttpMethodsService -from .resources.endpoints.resources.object.service.service import AbstractEndpointsObjectService -from .resources.endpoints.resources.params.service.service import AbstractEndpointsParamsService -from .resources.endpoints.resources.primitive.service.service import AbstractEndpointsPrimitiveService -from .resources.endpoints.resources.union.service.service import AbstractEndpointsUnionService -from .resources.inlined_requests.service.service import AbstractInlinedRequestsService -from .resources.no_auth.service.service import AbstractNoAuthService -from .resources.no_req_body.service.service import AbstractNoReqBodyService -from .resources.req_with_headers.service.service import AbstractReqWithHeadersService +from .endpoints.container.service.service import AbstractEndpointsContainerService +from .endpoints.enum.service.service import AbstractEndpointsEnumService +from .endpoints.http_methods.service.service import AbstractEndpointsHttpMethodsService +from .endpoints.object.service.service import AbstractEndpointsObjectService +from .endpoints.params.service.service import AbstractEndpointsParamsService +from .endpoints.primitive.service.service import AbstractEndpointsPrimitiveService +from .endpoints.union.service.service import AbstractEndpointsUnionService +from .inlined_requests.service.service import AbstractInlinedRequestsService +from .no_auth.service.service import AbstractNoAuthService +from .no_req_body.service.service import AbstractNoReqBodyService +from .req_with_headers.service.service import AbstractReqWithHeadersService def register( diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/no_req_body/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/req_with_headers/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/no_req_body/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/req_with_headers/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/req_with_headers/service/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/req_with_headers/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/req_with_headers/service/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/req_with_headers/service/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v1/resources/req_with_headers/service/service.py b/seed/fastapi/exhaustive/pydantic-v2/req_with_headers/service/service.py similarity index 93% rename from seed/fastapi/exhaustive/pydantic-v1/resources/req_with_headers/service/service.py rename to seed/fastapi/exhaustive/pydantic-v2/req_with_headers/service/service.py index 7b31e8311..a898b99a3 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/resources/req_with_headers/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v2/req_with_headers/service/service.py @@ -9,10 +9,10 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args +from ...security import ApiAuth, FernAuth class AbstractReqWithHeadersService(AbstractFernService): diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/resources/__init__.py deleted file mode 100644 index 29cd28565..000000000 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/__init__.py +++ /dev/null @@ -1,14 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import general_errors, inlined_requests, types -from .general_errors import BadObjectRequestInfo, BadRequestBody -from .inlined_requests import PostWithObjectBody - -__all__ = [ - "BadObjectRequestInfo", - "BadRequestBody", - "PostWithObjectBody", - "general_errors", - "inlined_requests", - "types", -] diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/resources/types/__init__.py deleted file mode 100644 index a1bb4ed73..000000000 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/types/__init__.py +++ /dev/null @@ -1,43 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import ( - Animal, - Cat, - Dog, - ErrorWithEnumBody, - ErrorWithUnionBody, - NestedObjectWithOptionalField, - NestedObjectWithOptionalFieldError, - NestedObjectWithRequiredField, - NestedObjectWithRequiredFieldError, - ObjectWithMapOfMap, - ObjectWithOptionalField, - ObjectWithOptionalFieldError, - ObjectWithRequiredField, - ObjectWithRequiredFieldError, - WeatherReport, - enum, - object, - union, -) - -__all__ = [ - "Animal", - "Cat", - "Dog", - "ErrorWithEnumBody", - "ErrorWithUnionBody", - "NestedObjectWithOptionalField", - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredField", - "NestedObjectWithRequiredFieldError", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredField", - "ObjectWithRequiredFieldError", - "WeatherReport", - "enum", - "object", - "union", -] diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/types/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/enum/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/types/enum/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/enum/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/types/enum/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/enum/errors/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/types/enum/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/enum/errors/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/types/enum/errors/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/enum/errors/error_with_enum_body.py b/seed/fastapi/exhaustive/pydantic-v2/types/enum/errors/error_with_enum_body.py similarity index 80% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/enum/errors/error_with_enum_body.py rename to seed/fastapi/exhaustive/pydantic-v2/types/enum/errors/error_with_enum_body.py index 8b8a0d981..e6a1a1e03 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/enum/errors/error_with_enum_body.py +++ b/seed/fastapi/exhaustive/pydantic-v2/types/enum/errors/error_with_enum_body.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.weather_report import WeatherReport diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/enum/types/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/types/enum/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/enum/types/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/types/enum/types/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/enum/types/weather_report.py b/seed/fastapi/exhaustive/pydantic-v2/types/enum/types/weather_report.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/enum/types/weather_report.py rename to seed/fastapi/exhaustive/pydantic-v2/types/enum/types/weather_report.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/types/object/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/types/object/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/errors/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/types/object/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/errors/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/types/object/errors/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/errors/nested_object_with_optional_field_error.py b/seed/fastapi/exhaustive/pydantic-v2/types/object/errors/nested_object_with_optional_field_error.py similarity index 83% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/errors/nested_object_with_optional_field_error.py rename to seed/fastapi/exhaustive/pydantic-v2/types/object/errors/nested_object_with_optional_field_error.py index 3ba440b27..673694198 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/errors/nested_object_with_optional_field_error.py +++ b/seed/fastapi/exhaustive/pydantic-v2/types/object/errors/nested_object_with_optional_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.nested_object_with_optional_field import NestedObjectWithOptionalField diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/errors/nested_object_with_required_field_error.py b/seed/fastapi/exhaustive/pydantic-v2/types/object/errors/nested_object_with_required_field_error.py similarity index 83% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/errors/nested_object_with_required_field_error.py rename to seed/fastapi/exhaustive/pydantic-v2/types/object/errors/nested_object_with_required_field_error.py index 10b5e8500..0dee308fe 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/errors/nested_object_with_required_field_error.py +++ b/seed/fastapi/exhaustive/pydantic-v2/types/object/errors/nested_object_with_required_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.nested_object_with_required_field import NestedObjectWithRequiredField diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/errors/object_with_optional_field_error.py b/seed/fastapi/exhaustive/pydantic-v2/types/object/errors/object_with_optional_field_error.py similarity index 82% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/errors/object_with_optional_field_error.py rename to seed/fastapi/exhaustive/pydantic-v2/types/object/errors/object_with_optional_field_error.py index 09a92f4c4..6590b1f10 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/errors/object_with_optional_field_error.py +++ b/seed/fastapi/exhaustive/pydantic-v2/types/object/errors/object_with_optional_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.object_with_optional_field import ObjectWithOptionalField diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/errors/object_with_required_field_error.py b/seed/fastapi/exhaustive/pydantic-v2/types/object/errors/object_with_required_field_error.py similarity index 82% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/errors/object_with_required_field_error.py rename to seed/fastapi/exhaustive/pydantic-v2/types/object/errors/object_with_required_field_error.py index c0c5cc118..c0601c7c2 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/errors/object_with_required_field_error.py +++ b/seed/fastapi/exhaustive/pydantic-v2/types/object/errors/object_with_required_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.object_with_required_field import ObjectWithRequiredField diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/types/object/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/types/object/types/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/nested_object_with_optional_field.py b/seed/fastapi/exhaustive/pydantic-v2/types/object/types/nested_object_with_optional_field.py similarity index 94% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/nested_object_with_optional_field.py rename to seed/fastapi/exhaustive/pydantic-v2/types/object/types/nested_object_with_optional_field.py index 2b0fb9112..8fcc548d3 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/nested_object_with_optional_field.py +++ b/seed/fastapi/exhaustive/pydantic-v2/types/object/types/nested_object_with_optional_field.py @@ -5,7 +5,7 @@ import pydantic.v1 as pydantic -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/nested_object_with_required_field.py b/seed/fastapi/exhaustive/pydantic-v2/types/object/types/nested_object_with_required_field.py similarity index 94% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/nested_object_with_required_field.py rename to seed/fastapi/exhaustive/pydantic-v2/types/object/types/nested_object_with_required_field.py index e9c5993fe..79b399a39 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/nested_object_with_required_field.py +++ b/seed/fastapi/exhaustive/pydantic-v2/types/object/types/nested_object_with_required_field.py @@ -5,7 +5,7 @@ import pydantic.v1 as pydantic -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/object_with_map_of_map.py b/seed/fastapi/exhaustive/pydantic-v2/types/object/types/object_with_map_of_map.py similarity index 93% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/object_with_map_of_map.py rename to seed/fastapi/exhaustive/pydantic-v2/types/object/types/object_with_map_of_map.py index 25d7247e0..2c9fe4eed 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/object_with_map_of_map.py +++ b/seed/fastapi/exhaustive/pydantic-v2/types/object/types/object_with_map_of_map.py @@ -5,7 +5,7 @@ import pydantic.v1 as pydantic -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime class ObjectWithMapOfMap(pydantic.BaseModel): diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/object_with_optional_field.py b/seed/fastapi/exhaustive/pydantic-v2/types/object/types/object_with_optional_field.py similarity index 95% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/object_with_optional_field.py rename to seed/fastapi/exhaustive/pydantic-v2/types/object/types/object_with_optional_field.py index e7edaa27d..a163539b8 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/object_with_optional_field.py +++ b/seed/fastapi/exhaustive/pydantic-v2/types/object/types/object_with_optional_field.py @@ -6,7 +6,7 @@ import pydantic.v1 as pydantic -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime class ObjectWithOptionalField(pydantic.BaseModel): diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/object_with_required_field.py b/seed/fastapi/exhaustive/pydantic-v2/types/object/types/object_with_required_field.py similarity index 92% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/object_with_required_field.py rename to seed/fastapi/exhaustive/pydantic-v2/types/object/types/object_with_required_field.py index c12abb872..1a8e13659 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/object/types/object_with_required_field.py +++ b/seed/fastapi/exhaustive/pydantic-v2/types/object/types/object_with_required_field.py @@ -5,7 +5,7 @@ import pydantic.v1 as pydantic -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime class ObjectWithRequiredField(pydantic.BaseModel): diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/types/union/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/types/union/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/errors/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/types/union/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/errors/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/types/union/errors/__init__.py diff --git a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/errors/error_with_union_body.py b/seed/fastapi/exhaustive/pydantic-v2/types/union/errors/error_with_union_body.py similarity index 78% rename from seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/errors/error_with_union_body.py rename to seed/fastapi/exhaustive/pydantic-v2/types/union/errors/error_with_union_body.py index d4343a0ae..4c69d4c14 100644 --- a/seed/fastapi/exhaustive/no-custom-config/resources/types/resources/union/errors/error_with_union_body.py +++ b/seed/fastapi/exhaustive/pydantic-v2/types/union/errors/error_with_union_body.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.animal import Animal diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/types/__init__.py b/seed/fastapi/exhaustive/pydantic-v2/types/union/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/types/__init__.py rename to seed/fastapi/exhaustive/pydantic-v2/types/union/types/__init__.py diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/types/animal.py b/seed/fastapi/exhaustive/pydantic-v2/types/union/types/animal.py similarity index 61% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/types/animal.py rename to seed/fastapi/exhaustive/pydantic-v2/types/union/types/animal.py index eb55b6c22..347fbe065 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/types/animal.py +++ b/seed/fastapi/exhaustive/pydantic-v2/types/union/types/animal.py @@ -8,18 +8,18 @@ import pydantic.v1 as pydantic import typing_extensions -from ......core.datetime_utils import serialize_datetime -from .cat import Cat as resources_types_resources_union_types_cat_Cat -from .dog import Dog as resources_types_resources_union_types_dog_Dog +from ....core.datetime_utils import serialize_datetime +from .cat import Cat as types_union_types_cat_Cat +from .dog import Dog as types_union_types_dog_Dog T_Result = typing.TypeVar("T_Result") class _Factory: - def dog(self, value: resources_types_resources_union_types_dog_Dog) -> Animal: + def dog(self, value: types_union_types_dog_Dog) -> Animal: return Animal(__root__=_Animal.Dog(**value.dict(exclude_unset=True), animal="dog")) - def cat(self, value: resources_types_resources_union_types_cat_Cat) -> Animal: + def cat(self, value: types_union_types_cat_Cat) -> Animal: return Animal(__root__=_Animal.Cat(**value.dict(exclude_unset=True), animal="cat")) @@ -31,21 +31,13 @@ def get_as_union(self) -> typing.Union[_Animal.Dog, _Animal.Cat]: def visit( self, - dog: typing.Callable[[resources_types_resources_union_types_dog_Dog], T_Result], - cat: typing.Callable[[resources_types_resources_union_types_cat_Cat], T_Result], + dog: typing.Callable[[types_union_types_dog_Dog], T_Result], + cat: typing.Callable[[types_union_types_cat_Cat], T_Result], ) -> T_Result: if self.__root__.animal == "dog": - return dog( - resources_types_resources_union_types_dog_Dog( - **self.__root__.dict(exclude_unset=True, exclude={"animal"}) - ) - ) + return dog(types_union_types_dog_Dog(**self.__root__.dict(exclude_unset=True, exclude={"animal"}))) if self.__root__.animal == "cat": - return cat( - resources_types_resources_union_types_cat_Cat( - **self.__root__.dict(exclude_unset=True, exclude={"animal"}) - ) - ) + return cat(types_union_types_cat_Cat(**self.__root__.dict(exclude_unset=True, exclude={"animal"}))) __root__: typing_extensions.Annotated[ typing.Union[_Animal.Dog, _Animal.Cat], pydantic.Field(discriminator="animal") @@ -65,13 +57,13 @@ class Config: class _Animal: - class Dog(resources_types_resources_union_types_dog_Dog): + class Dog(types_union_types_dog_Dog): animal: typing_extensions.Literal["dog"] class Config: allow_population_by_field_name = True - class Cat(resources_types_resources_union_types_cat_Cat): + class Cat(types_union_types_cat_Cat): animal: typing_extensions.Literal["cat"] class Config: diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/types/cat.py b/seed/fastapi/exhaustive/pydantic-v2/types/union/types/cat.py similarity index 93% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/types/cat.py rename to seed/fastapi/exhaustive/pydantic-v2/types/union/types/cat.py index 35d941a68..8172c1ca1 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/types/cat.py +++ b/seed/fastapi/exhaustive/pydantic-v2/types/union/types/cat.py @@ -5,7 +5,7 @@ import pydantic.v1 as pydantic -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime class Cat(pydantic.BaseModel): diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/types/dog.py b/seed/fastapi/exhaustive/pydantic-v2/types/union/types/dog.py similarity index 93% rename from seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/types/dog.py rename to seed/fastapi/exhaustive/pydantic-v2/types/union/types/dog.py index fdbd55c33..2d4b21442 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/resources/types/resources/union/types/dog.py +++ b/seed/fastapi/exhaustive/pydantic-v2/types/union/types/dog.py @@ -5,7 +5,7 @@ import pydantic.v1 as pydantic -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime class Dog(pydantic.BaseModel): diff --git a/seed/fastapi/exhaustive/skip-formatting/__init__.py b/seed/fastapi/exhaustive/skip-formatting/__init__.py index 6c6c35bc0..2f3e5cf54 100644 --- a/seed/fastapi/exhaustive/skip-formatting/__init__.py +++ b/seed/fastapi/exhaustive/skip-formatting/__init__.py @@ -1,5 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import BadObjectRequestInfo, BadRequestBody, PostWithObjectBody, general_errors, inlined_requests, types +from . import general_errors, inlined_requests, types +from .general_errors import BadObjectRequestInfo, BadRequestBody +from .inlined_requests import PostWithObjectBody from .security import ApiAuth __all__ = ["ApiAuth", "BadObjectRequestInfo", "BadRequestBody", "PostWithObjectBody", "general_errors", "inlined_requests", "types"] diff --git a/seed/fastapi/exhaustive/pydantic-v2/resources/req_with_headers/__init__.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/container/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/pydantic-v2/resources/req_with_headers/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/container/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/container/service/__init__.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/container/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/container/service/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/container/service/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/container/service/service.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/container/service/service.py similarity index 98% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/container/service/service.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/container/service/service.py index ed0e0062e..85e134c85 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/container/service/service.py +++ b/seed/fastapi/exhaustive/skip-formatting/endpoints/container/service/service.py @@ -1,17 +1,17 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.abstract_fern_service import AbstractFernService +from ....core.abstract_fern_service import AbstractFernService import typing -from ......security import ApiAuth +from ....security import ApiAuth import abc -from .....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ....types.object.types.object_with_required_field import ObjectWithRequiredField import fastapi import inspect -from ......security import FernAuth -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....security import FernAuth +from ....core.exceptions.fern_http_exception import FernHTTPException import logging import functools -from ......core.route_args import get_route_args +from ....core.route_args import get_route_args class AbstractEndpointsContainerService(AbstractFernService): """ AbstractEndpointsContainerService is an abstract class containing the methods that you should implement. diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/container/__init__.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/enum/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/container/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/enum/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/enum/service/__init__.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/enum/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/enum/service/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/enum/service/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/enum/service/service.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/enum/service/service.py similarity index 89% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/enum/service/service.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/enum/service/service.py index aeb7d1945..9f9cbf1ba 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/enum/service/service.py +++ b/seed/fastapi/exhaustive/skip-formatting/endpoints/enum/service/service.py @@ -1,17 +1,17 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.abstract_fern_service import AbstractFernService -from .....types.resources.enum.types.weather_report import WeatherReport -from ......security import ApiAuth +from ....core.abstract_fern_service import AbstractFernService +from ....types.enum.types.weather_report import WeatherReport +from ....security import ApiAuth import abc import fastapi import inspect import typing -from ......security import FernAuth -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....security import FernAuth +from ....core.exceptions.fern_http_exception import FernHTTPException import logging import functools -from ......core.route_args import get_route_args +from ....core.route_args import get_route_args class AbstractEndpointsEnumService(AbstractFernService): """ AbstractEndpointsEnumService is an abstract class containing the methods that you should implement. diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/enum/__init__.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/http_methods/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/enum/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/http_methods/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/http_methods/service/__init__.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/http_methods/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/http_methods/service/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/http_methods/service/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/http_methods/service/service.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/http_methods/service/service.py similarity index 96% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/http_methods/service/service.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/http_methods/service/service.py index 2f23bc782..7a9690072 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/http_methods/service/service.py +++ b/seed/fastapi/exhaustive/skip-formatting/endpoints/http_methods/service/service.py @@ -1,18 +1,18 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.abstract_fern_service import AbstractFernService -from ......security import ApiAuth +from ....core.abstract_fern_service import AbstractFernService +from ....security import ApiAuth import abc -from .....types.resources.object.types.object_with_required_field import ObjectWithRequiredField -from .....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ....types.object.types.object_with_required_field import ObjectWithRequiredField +from ....types.object.types.object_with_optional_field import ObjectWithOptionalField import fastapi import inspect import typing -from ......security import FernAuth -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....security import FernAuth +from ....core.exceptions.fern_http_exception import FernHTTPException import logging import functools -from ......core.route_args import get_route_args +from ....core.route_args import get_route_args class AbstractEndpointsHttpMethodsService(AbstractFernService): """ AbstractEndpointsHttpMethodsService is an abstract class containing the methods that you should implement. diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/http_methods/__init__.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/object/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/http_methods/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/object/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/object/service/__init__.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/object/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/object/service/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/object/service/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/object/service/service.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/object/service/service.py similarity index 94% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/object/service/service.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/object/service/service.py index bda28a0c2..cfd330821 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/object/service/service.py +++ b/seed/fastapi/exhaustive/skip-formatting/endpoints/object/service/service.py @@ -1,21 +1,21 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.abstract_fern_service import AbstractFernService -from .....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from ......security import ApiAuth +from ....core.abstract_fern_service import AbstractFernService +from ....types.object.types.object_with_optional_field import ObjectWithOptionalField +from ....security import ApiAuth import abc -from .....types.resources.object.types.object_with_required_field import ObjectWithRequiredField -from .....types.resources.object.types.object_with_map_of_map import ObjectWithMapOfMap -from .....types.resources.object.types.nested_object_with_optional_field import NestedObjectWithOptionalField -from .....types.resources.object.types.nested_object_with_required_field import NestedObjectWithRequiredField +from ....types.object.types.object_with_required_field import ObjectWithRequiredField +from ....types.object.types.object_with_map_of_map import ObjectWithMapOfMap +from ....types.object.types.nested_object_with_optional_field import NestedObjectWithOptionalField +from ....types.object.types.nested_object_with_required_field import NestedObjectWithRequiredField import fastapi import inspect import typing -from ......security import FernAuth -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....security import FernAuth +from ....core.exceptions.fern_http_exception import FernHTTPException import logging import functools -from ......core.route_args import get_route_args +from ....core.route_args import get_route_args class AbstractEndpointsObjectService(AbstractFernService): """ AbstractEndpointsObjectService is an abstract class containing the methods that you should implement. diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/object/__init__.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/params/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/object/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/params/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/params/service/__init__.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/params/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/params/service/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/params/service/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/params/service/service.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/params/service/service.py similarity index 98% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/params/service/service.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/params/service/service.py index 16c2ad557..5505593d8 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/params/service/service.py +++ b/seed/fastapi/exhaustive/skip-formatting/endpoints/params/service/service.py @@ -1,16 +1,16 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.abstract_fern_service import AbstractFernService -from ......security import ApiAuth +from ....core.abstract_fern_service import AbstractFernService +from ....security import ApiAuth import abc import typing import fastapi import inspect -from ......security import FernAuth -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....security import FernAuth +from ....core.exceptions.fern_http_exception import FernHTTPException import logging import functools -from ......core.route_args import get_route_args +from ....core.route_args import get_route_args import starlette class AbstractEndpointsParamsService(AbstractFernService): """ diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/params/__init__.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/primitive/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/params/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/primitive/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/primitive/service/__init__.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/primitive/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/primitive/service/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/primitive/service/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/primitive/service/service.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/primitive/service/service.py similarity index 98% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/primitive/service/service.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/primitive/service/service.py index ab6551cd5..9e9774b27 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/primitive/service/service.py +++ b/seed/fastapi/exhaustive/skip-formatting/endpoints/primitive/service/service.py @@ -1,18 +1,18 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.abstract_fern_service import AbstractFernService -from ......security import ApiAuth +from ....core.abstract_fern_service import AbstractFernService +from ....security import ApiAuth import abc import datetime as dt import uuid import fastapi import inspect import typing -from ......security import FernAuth -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....security import FernAuth +from ....core.exceptions.fern_http_exception import FernHTTPException import logging import functools -from ......core.route_args import get_route_args +from ....core.route_args import get_route_args class AbstractEndpointsPrimitiveService(AbstractFernService): """ AbstractEndpointsPrimitiveService is an abstract class containing the methods that you should implement. diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/primitive/__init__.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/union/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/primitive/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/union/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/union/service/__init__.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/union/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/union/service/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/union/service/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/union/service/service.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/union/service/service.py similarity index 90% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/union/service/service.py rename to seed/fastapi/exhaustive/skip-formatting/endpoints/union/service/service.py index 8d0a63b96..0cb9984b2 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/union/service/service.py +++ b/seed/fastapi/exhaustive/skip-formatting/endpoints/union/service/service.py @@ -1,17 +1,17 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.abstract_fern_service import AbstractFernService -from .....types.resources.union.types.animal import Animal -from ......security import ApiAuth +from ....core.abstract_fern_service import AbstractFernService +from ....types.union.types.animal import Animal +from ....security import ApiAuth import abc import fastapi import inspect import typing -from ......security import FernAuth -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....security import FernAuth +from ....core.exceptions.fern_http_exception import FernHTTPException import logging import functools -from ......core.route_args import get_route_args +from ....core.route_args import get_route_args class AbstractEndpointsUnionService(AbstractFernService): """ AbstractEndpointsUnionService is an abstract class containing the methods that you should implement. diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/general_errors/__init__.py b/seed/fastapi/exhaustive/skip-formatting/general_errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/general_errors/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/general_errors/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/general_errors/errors/__init__.py b/seed/fastapi/exhaustive/skip-formatting/general_errors/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/general_errors/errors/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/general_errors/errors/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/general_errors/errors/bad_request_body.py b/seed/fastapi/exhaustive/skip-formatting/general_errors/errors/bad_request_body.py similarity index 81% rename from seed/fastapi/exhaustive/skip-formatting/resources/general_errors/errors/bad_request_body.py rename to seed/fastapi/exhaustive/skip-formatting/general_errors/errors/bad_request_body.py index da074e29e..fdc9a327b 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/general_errors/errors/bad_request_body.py +++ b/seed/fastapi/exhaustive/skip-formatting/general_errors/errors/bad_request_body.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...core.exceptions.fern_http_exception import FernHTTPException from ..types.bad_object_request_info import BadObjectRequestInfo class BadRequestBody(FernHTTPException): def __init__(self, error: BadObjectRequestInfo): diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/general_errors/types/__init__.py b/seed/fastapi/exhaustive/skip-formatting/general_errors/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/general_errors/types/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/general_errors/types/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/general_errors/types/bad_object_request_info.py b/seed/fastapi/exhaustive/skip-formatting/general_errors/types/bad_object_request_info.py similarity index 93% rename from seed/fastapi/exhaustive/skip-formatting/resources/general_errors/types/bad_object_request_info.py rename to seed/fastapi/exhaustive/skip-formatting/general_errors/types/bad_object_request_info.py index cd4054fa1..ab1b9163b 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/general_errors/types/bad_object_request_info.py +++ b/seed/fastapi/exhaustive/skip-formatting/general_errors/types/bad_object_request_info.py @@ -2,7 +2,7 @@ import typing import datetime as dt -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/inlined_requests/__init__.py b/seed/fastapi/exhaustive/skip-formatting/inlined_requests/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/inlined_requests/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/inlined_requests/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/inlined_requests/service/__init__.py b/seed/fastapi/exhaustive/skip-formatting/inlined_requests/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/inlined_requests/service/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/inlined_requests/service/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/inlined_requests/service/post_with_object_body.py b/seed/fastapi/exhaustive/skip-formatting/inlined_requests/service/post_with_object_body.py similarity index 86% rename from seed/fastapi/exhaustive/skip-formatting/resources/inlined_requests/service/post_with_object_body.py rename to seed/fastapi/exhaustive/skip-formatting/inlined_requests/service/post_with_object_body.py index 26eb060b1..dcaca283c 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/inlined_requests/service/post_with_object_body.py +++ b/seed/fastapi/exhaustive/skip-formatting/inlined_requests/service/post_with_object_body.py @@ -1,9 +1,9 @@ # This file was auto-generated by Fern from our API Definition. -from ...types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ...types.object.types.object_with_optional_field import ObjectWithOptionalField import typing import datetime as dt -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/inlined_requests/service/service.py b/seed/fastapi/exhaustive/skip-formatting/inlined_requests/service/service.py similarity index 92% rename from seed/fastapi/exhaustive/skip-formatting/resources/inlined_requests/service/service.py rename to seed/fastapi/exhaustive/skip-formatting/inlined_requests/service/service.py index 48021ef8e..192e2126a 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/inlined_requests/service/service.py +++ b/seed/fastapi/exhaustive/skip-formatting/inlined_requests/service/service.py @@ -1,17 +1,17 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.abstract_fern_service import AbstractFernService +from ...core.abstract_fern_service import AbstractFernService from .post_with_object_body import PostWithObjectBody -from ...types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ...types.object.types.object_with_optional_field import ObjectWithOptionalField import abc import fastapi import inspect import typing from ...general_errors.errors.bad_request_body import BadRequestBody -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...core.exceptions.fern_http_exception import FernHTTPException import logging import functools -from ....core.route_args import get_route_args +from ...core.route_args import get_route_args class AbstractInlinedRequestsService(AbstractFernService): """ AbstractInlinedRequestsService is an abstract class containing the methods that you should implement. diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/union/__init__.py b/seed/fastapi/exhaustive/skip-formatting/no_auth/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/endpoints/resources/union/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/no_auth/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/no_auth/service/__init__.py b/seed/fastapi/exhaustive/skip-formatting/no_auth/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/no_auth/service/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/no_auth/service/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/no_auth/service/service.py b/seed/fastapi/exhaustive/skip-formatting/no_auth/service/service.py similarity index 94% rename from seed/fastapi/exhaustive/skip-formatting/resources/no_auth/service/service.py rename to seed/fastapi/exhaustive/skip-formatting/no_auth/service/service.py index 70ab61b08..a8271ff1f 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/no_auth/service/service.py +++ b/seed/fastapi/exhaustive/skip-formatting/no_auth/service/service.py @@ -1,15 +1,15 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.abstract_fern_service import AbstractFernService +from ...core.abstract_fern_service import AbstractFernService import typing import abc import fastapi import inspect from ...general_errors.errors.bad_request_body import BadRequestBody -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...core.exceptions.fern_http_exception import FernHTTPException import logging import functools -from ....core.route_args import get_route_args +from ...core.route_args import get_route_args class AbstractNoAuthService(AbstractFernService): """ AbstractNoAuthService is an abstract class containing the methods that you should implement. diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/no_auth/__init__.py b/seed/fastapi/exhaustive/skip-formatting/no_req_body/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/no_auth/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/no_req_body/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/no_req_body/service/__init__.py b/seed/fastapi/exhaustive/skip-formatting/no_req_body/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/no_req_body/service/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/no_req_body/service/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/no_req_body/service/service.py b/seed/fastapi/exhaustive/skip-formatting/no_req_body/service/service.py similarity index 93% rename from seed/fastapi/exhaustive/skip-formatting/resources/no_req_body/service/service.py rename to seed/fastapi/exhaustive/skip-formatting/no_req_body/service/service.py index bc1d357e4..f2882dda7 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/no_req_body/service/service.py +++ b/seed/fastapi/exhaustive/skip-formatting/no_req_body/service/service.py @@ -1,17 +1,17 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.abstract_fern_service import AbstractFernService -from ....security import ApiAuth -from ...types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ...core.abstract_fern_service import AbstractFernService +from ...security import ApiAuth +from ...types.object.types.object_with_optional_field import ObjectWithOptionalField import abc import fastapi import inspect import typing -from ....security import FernAuth -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...security import FernAuth +from ...core.exceptions.fern_http_exception import FernHTTPException import logging import functools -from ....core.route_args import get_route_args +from ...core.route_args import get_route_args class AbstractNoReqBodyService(AbstractFernService): """ AbstractNoReqBodyService is an abstract class containing the methods that you should implement. diff --git a/seed/fastapi/exhaustive/skip-formatting/register.py b/seed/fastapi/exhaustive/skip-formatting/register.py index 1d32041ed..bddf6e89f 100644 --- a/seed/fastapi/exhaustive/skip-formatting/register.py +++ b/seed/fastapi/exhaustive/skip-formatting/register.py @@ -1,17 +1,17 @@ # This file was auto-generated by Fern from our API Definition. import fastapi -from .resources.endpoints.resources.container.service.service import AbstractEndpointsContainerService -from .resources.endpoints.resources.enum.service.service import AbstractEndpointsEnumService -from .resources.endpoints.resources.http_methods.service.service import AbstractEndpointsHttpMethodsService -from .resources.endpoints.resources.object.service.service import AbstractEndpointsObjectService -from .resources.endpoints.resources.params.service.service import AbstractEndpointsParamsService -from .resources.endpoints.resources.primitive.service.service import AbstractEndpointsPrimitiveService -from .resources.endpoints.resources.union.service.service import AbstractEndpointsUnionService -from .resources.inlined_requests.service.service import AbstractInlinedRequestsService -from .resources.no_auth.service.service import AbstractNoAuthService -from .resources.no_req_body.service.service import AbstractNoReqBodyService -from .resources.req_with_headers.service.service import AbstractReqWithHeadersService +from .endpoints.container.service.service import AbstractEndpointsContainerService +from .endpoints.enum.service.service import AbstractEndpointsEnumService +from .endpoints.http_methods.service.service import AbstractEndpointsHttpMethodsService +from .endpoints.object.service.service import AbstractEndpointsObjectService +from .endpoints.params.service.service import AbstractEndpointsParamsService +from .endpoints.primitive.service.service import AbstractEndpointsPrimitiveService +from .endpoints.union.service.service import AbstractEndpointsUnionService +from .inlined_requests.service.service import AbstractInlinedRequestsService +from .no_auth.service.service import AbstractNoAuthService +from .no_req_body.service.service import AbstractNoReqBodyService +from .req_with_headers.service.service import AbstractReqWithHeadersService import typing from fastapi import params from .core.exceptions.fern_http_exception import FernHTTPException diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/no_req_body/__init__.py b/seed/fastapi/exhaustive/skip-formatting/req_with_headers/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/no_req_body/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/req_with_headers/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/req_with_headers/service/__init__.py b/seed/fastapi/exhaustive/skip-formatting/req_with_headers/service/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/req_with_headers/service/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/req_with_headers/service/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/req_with_headers/service/service.py b/seed/fastapi/exhaustive/skip-formatting/req_with_headers/service/service.py similarity index 92% rename from seed/fastapi/exhaustive/skip-formatting/resources/req_with_headers/service/service.py rename to seed/fastapi/exhaustive/skip-formatting/req_with_headers/service/service.py index f8c1d61aa..db940d5b0 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/req_with_headers/service/service.py +++ b/seed/fastapi/exhaustive/skip-formatting/req_with_headers/service/service.py @@ -1,17 +1,17 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.abstract_fern_service import AbstractFernService -from ....security import ApiAuth +from ...core.abstract_fern_service import AbstractFernService +from ...security import ApiAuth import abc import fastapi import inspect import typing -from ....security import FernAuth -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...security import FernAuth +from ...core.exceptions.fern_http_exception import FernHTTPException import logging import functools import starlette -from ....core.route_args import get_route_args +from ...core.route_args import get_route_args class AbstractReqWithHeadersService(AbstractFernService): """ AbstractReqWithHeadersService is an abstract class containing the methods that you should implement. diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/__init__.py b/seed/fastapi/exhaustive/skip-formatting/resources/__init__.py deleted file mode 100644 index fa8a36785..000000000 --- a/seed/fastapi/exhaustive/skip-formatting/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import general_errors, inlined_requests, types -from .general_errors import BadObjectRequestInfo, BadRequestBody -from .inlined_requests import PostWithObjectBody -__all__ = ["BadObjectRequestInfo", "BadRequestBody", "PostWithObjectBody", "general_errors", "inlined_requests", "types"] diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/__init__.py b/seed/fastapi/exhaustive/skip-formatting/resources/types/__init__.py deleted file mode 100644 index f15d5e365..000000000 --- a/seed/fastapi/exhaustive/skip-formatting/resources/types/__init__.py +++ /dev/null @@ -1,4 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import Animal, Cat, Dog, ErrorWithEnumBody, ErrorWithUnionBody, NestedObjectWithOptionalField, NestedObjectWithOptionalFieldError, NestedObjectWithRequiredField, NestedObjectWithRequiredFieldError, ObjectWithMapOfMap, ObjectWithOptionalField, ObjectWithOptionalFieldError, ObjectWithRequiredField, ObjectWithRequiredFieldError, WeatherReport, enum, object, union -__all__ = ["Animal", "Cat", "Dog", "ErrorWithEnumBody", "ErrorWithUnionBody", "NestedObjectWithOptionalField", "NestedObjectWithOptionalFieldError", "NestedObjectWithRequiredField", "NestedObjectWithRequiredFieldError", "ObjectWithMapOfMap", "ObjectWithOptionalField", "ObjectWithOptionalFieldError", "ObjectWithRequiredField", "ObjectWithRequiredFieldError", "WeatherReport", "enum", "object", "union"] diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/__init__.py b/seed/fastapi/exhaustive/skip-formatting/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/types/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/enum/__init__.py b/seed/fastapi/exhaustive/skip-formatting/types/enum/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/enum/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/types/enum/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/enum/errors/__init__.py b/seed/fastapi/exhaustive/skip-formatting/types/enum/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/enum/errors/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/types/enum/errors/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/enum/errors/error_with_enum_body.py b/seed/fastapi/exhaustive/skip-formatting/types/enum/errors/error_with_enum_body.py similarity index 79% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/enum/errors/error_with_enum_body.py rename to seed/fastapi/exhaustive/skip-formatting/types/enum/errors/error_with_enum_body.py index 6309713be..835259937 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/enum/errors/error_with_enum_body.py +++ b/seed/fastapi/exhaustive/skip-formatting/types/enum/errors/error_with_enum_body.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.weather_report import WeatherReport class ErrorWithEnumBody(FernHTTPException): def __init__(self, error: WeatherReport): diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/enum/types/__init__.py b/seed/fastapi/exhaustive/skip-formatting/types/enum/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/enum/types/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/types/enum/types/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/enum/types/weather_report.py b/seed/fastapi/exhaustive/skip-formatting/types/enum/types/weather_report.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/enum/types/weather_report.py rename to seed/fastapi/exhaustive/skip-formatting/types/enum/types/weather_report.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/__init__.py b/seed/fastapi/exhaustive/skip-formatting/types/object/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/types/object/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/errors/__init__.py b/seed/fastapi/exhaustive/skip-formatting/types/object/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/errors/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/types/object/errors/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/errors/nested_object_with_optional_field_error.py b/seed/fastapi/exhaustive/skip-formatting/types/object/errors/nested_object_with_optional_field_error.py similarity index 83% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/errors/nested_object_with_optional_field_error.py rename to seed/fastapi/exhaustive/skip-formatting/types/object/errors/nested_object_with_optional_field_error.py index 40182079f..ff5e47331 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/errors/nested_object_with_optional_field_error.py +++ b/seed/fastapi/exhaustive/skip-formatting/types/object/errors/nested_object_with_optional_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.nested_object_with_optional_field import NestedObjectWithOptionalField class NestedObjectWithOptionalFieldError(FernHTTPException): def __init__(self, error: NestedObjectWithOptionalField): diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/errors/nested_object_with_required_field_error.py b/seed/fastapi/exhaustive/skip-formatting/types/object/errors/nested_object_with_required_field_error.py similarity index 83% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/errors/nested_object_with_required_field_error.py rename to seed/fastapi/exhaustive/skip-formatting/types/object/errors/nested_object_with_required_field_error.py index 8e7e5beca..2853b03a5 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/errors/nested_object_with_required_field_error.py +++ b/seed/fastapi/exhaustive/skip-formatting/types/object/errors/nested_object_with_required_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.nested_object_with_required_field import NestedObjectWithRequiredField class NestedObjectWithRequiredFieldError(FernHTTPException): def __init__(self, error: NestedObjectWithRequiredField): diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/errors/object_with_optional_field_error.py b/seed/fastapi/exhaustive/skip-formatting/types/object/errors/object_with_optional_field_error.py similarity index 82% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/errors/object_with_optional_field_error.py rename to seed/fastapi/exhaustive/skip-formatting/types/object/errors/object_with_optional_field_error.py index a1d15b646..8ee03b3b6 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/errors/object_with_optional_field_error.py +++ b/seed/fastapi/exhaustive/skip-formatting/types/object/errors/object_with_optional_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.object_with_optional_field import ObjectWithOptionalField class ObjectWithOptionalFieldError(FernHTTPException): def __init__(self, error: ObjectWithOptionalField): diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/errors/object_with_required_field_error.py b/seed/fastapi/exhaustive/skip-formatting/types/object/errors/object_with_required_field_error.py similarity index 82% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/errors/object_with_required_field_error.py rename to seed/fastapi/exhaustive/skip-formatting/types/object/errors/object_with_required_field_error.py index d727e2da0..2679ee674 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/errors/object_with_required_field_error.py +++ b/seed/fastapi/exhaustive/skip-formatting/types/object/errors/object_with_required_field_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.object_with_required_field import ObjectWithRequiredField class ObjectWithRequiredFieldError(FernHTTPException): def __init__(self, error: ObjectWithRequiredField): diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/__init__.py b/seed/fastapi/exhaustive/skip-formatting/types/object/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/types/object/types/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/nested_object_with_optional_field.py b/seed/fastapi/exhaustive/skip-formatting/types/object/types/nested_object_with_optional_field.py similarity index 94% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/nested_object_with_optional_field.py rename to seed/fastapi/exhaustive/skip-formatting/types/object/types/nested_object_with_optional_field.py index 886c6a7da..1010ad2df 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/nested_object_with_optional_field.py +++ b/seed/fastapi/exhaustive/skip-formatting/types/object/types/nested_object_with_optional_field.py @@ -3,7 +3,7 @@ import typing from .object_with_optional_field import ObjectWithOptionalField import datetime as dt -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/nested_object_with_required_field.py b/seed/fastapi/exhaustive/skip-formatting/types/object/types/nested_object_with_required_field.py similarity index 94% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/nested_object_with_required_field.py rename to seed/fastapi/exhaustive/skip-formatting/types/object/types/nested_object_with_required_field.py index 465ff2089..0453cfdcc 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/nested_object_with_required_field.py +++ b/seed/fastapi/exhaustive/skip-formatting/types/object/types/nested_object_with_required_field.py @@ -3,7 +3,7 @@ from .object_with_optional_field import ObjectWithOptionalField import typing import datetime as dt -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/object_with_map_of_map.py b/seed/fastapi/exhaustive/skip-formatting/types/object/types/object_with_map_of_map.py similarity index 93% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/object_with_map_of_map.py rename to seed/fastapi/exhaustive/skip-formatting/types/object/types/object_with_map_of_map.py index 2bba6bb67..aedb06e91 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/object_with_map_of_map.py +++ b/seed/fastapi/exhaustive/skip-formatting/types/object/types/object_with_map_of_map.py @@ -2,7 +2,7 @@ import typing import datetime as dt -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/object_with_optional_field.py b/seed/fastapi/exhaustive/skip-formatting/types/object/types/object_with_optional_field.py similarity index 95% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/object_with_optional_field.py rename to seed/fastapi/exhaustive/skip-formatting/types/object/types/object_with_optional_field.py index 2219eb9f2..80a100533 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/object_with_optional_field.py +++ b/seed/fastapi/exhaustive/skip-formatting/types/object/types/object_with_optional_field.py @@ -3,7 +3,7 @@ import typing import datetime as dt import uuid -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/object_with_required_field.py b/seed/fastapi/exhaustive/skip-formatting/types/object/types/object_with_required_field.py similarity index 93% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/object_with_required_field.py rename to seed/fastapi/exhaustive/skip-formatting/types/object/types/object_with_required_field.py index bf5d74a61..1d573464c 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/object/types/object_with_required_field.py +++ b/seed/fastapi/exhaustive/skip-formatting/types/object/types/object_with_required_field.py @@ -2,7 +2,7 @@ import typing import datetime as dt -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/__init__.py b/seed/fastapi/exhaustive/skip-formatting/types/union/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/types/union/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/errors/__init__.py b/seed/fastapi/exhaustive/skip-formatting/types/union/errors/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/errors/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/types/union/errors/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/errors/error_with_union_body.py b/seed/fastapi/exhaustive/skip-formatting/types/union/errors/error_with_union_body.py similarity index 78% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/errors/error_with_union_body.py rename to seed/fastapi/exhaustive/skip-formatting/types/union/errors/error_with_union_body.py index ccfa23b83..2d58f5875 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/errors/error_with_union_body.py +++ b/seed/fastapi/exhaustive/skip-formatting/types/union/errors/error_with_union_body.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.exceptions.fern_http_exception import FernHTTPException +from ....core.exceptions.fern_http_exception import FernHTTPException from ..types.animal import Animal class ErrorWithUnionBody(FernHTTPException): def __init__(self, error: Animal): diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/types/__init__.py b/seed/fastapi/exhaustive/skip-formatting/types/union/types/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/types/__init__.py rename to seed/fastapi/exhaustive/skip-formatting/types/union/types/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/types/animal.py b/seed/fastapi/exhaustive/skip-formatting/types/union/types/animal.py similarity index 65% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/types/animal.py rename to seed/fastapi/exhaustive/skip-formatting/types/union/types/animal.py index c9c9c7dcc..6040a4547 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/types/animal.py +++ b/seed/fastapi/exhaustive/skip-formatting/types/union/types/animal.py @@ -1,12 +1,12 @@ # This file was auto-generated by Fern from our API Definition. from __future__ import annotations -from .dog import Dog as resources_types_resources_union_types_dog_Dog -from .cat import Cat as resources_types_resources_union_types_cat_Cat +from .dog import Dog as types_union_types_dog_Dog +from .cat import Cat as types_union_types_cat_Cat import typing import typing_extensions import datetime as dt -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore @@ -15,21 +15,21 @@ T_Result = typing.TypeVar("T_Result") class _Factory: - def dog(self, value: resources_types_resources_union_types_dog_Dog) -> Animal: + def dog(self, value: types_union_types_dog_Dog) -> Animal: return Animal(__root__=_Animal.Dog(**value.dict(exclude_unset=True), animal="dog")) - def cat(self, value: resources_types_resources_union_types_cat_Cat) -> Animal: + def cat(self, value: types_union_types_cat_Cat) -> Animal: return Animal(__root__=_Animal.Cat(**value.dict(exclude_unset=True), animal="cat")) class Animal(pydantic.BaseModel): factory: typing.ClassVar[_Factory] = _Factory() def get_as_union(self) -> typing.Union[_Animal.Dog, _Animal.Cat]: return self.__root__ - def visit(self, dog: typing.Callable[[resources_types_resources_union_types_dog_Dog], T_Result], cat: typing.Callable[[resources_types_resources_union_types_cat_Cat], T_Result]) -> T_Result: + def visit(self, dog: typing.Callable[[types_union_types_dog_Dog], T_Result], cat: typing.Callable[[types_union_types_cat_Cat], T_Result]) -> T_Result: if self.__root__.animal == "dog": return dog( - resources_types_resources_union_types_dog_Dog(**self.__root__.dict(exclude_unset=True, exclude={"animal"}))) + types_union_types_dog_Dog(**self.__root__.dict(exclude_unset=True, exclude={"animal"}))) if self.__root__.animal == "cat": return cat( - resources_types_resources_union_types_cat_Cat(**self.__root__.dict(exclude_unset=True, exclude={"animal"}))) + types_union_types_cat_Cat(**self.__root__.dict(exclude_unset=True, exclude={"animal"}))) __root__: typing_extensions.Annotated[typing.Union[_Animal.Dog, _Animal.Cat], pydantic.Field(discriminator="animal")] def json(self, **kwargs: typing.Any) -> str: kwargs_with_defaults: typing.Any = { "by_alias": True, "exclude_unset": True, **kwargs } @@ -41,11 +41,11 @@ class Config: extra = pydantic.Extra.forbid json_encoders = {dt.datetime: serialize_datetime} class _Animal: - class Dog(resources_types_resources_union_types_dog_Dog): + class Dog(types_union_types_dog_Dog): animal: typing_extensions.Literal["dog"] class Config: allow_population_by_field_name = True - class Cat(resources_types_resources_union_types_cat_Cat): + class Cat(types_union_types_cat_Cat): animal: typing_extensions.Literal["cat"] class Config: allow_population_by_field_name = True diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/types/cat.py b/seed/fastapi/exhaustive/skip-formatting/types/union/types/cat.py similarity index 94% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/types/cat.py rename to seed/fastapi/exhaustive/skip-formatting/types/union/types/cat.py index b13ce4698..d99f0fd5d 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/types/cat.py +++ b/seed/fastapi/exhaustive/skip-formatting/types/union/types/cat.py @@ -2,7 +2,7 @@ import typing import datetime as dt -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/types/dog.py b/seed/fastapi/exhaustive/skip-formatting/types/union/types/dog.py similarity index 94% rename from seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/types/dog.py rename to seed/fastapi/exhaustive/skip-formatting/types/union/types/dog.py index 5f1b8630c..94fa85f6e 100644 --- a/seed/fastapi/exhaustive/skip-formatting/resources/types/resources/union/types/dog.py +++ b/seed/fastapi/exhaustive/skip-formatting/types/union/types/dog.py @@ -2,7 +2,7 @@ import typing import datetime as dt -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/folders/__init__.py b/seed/fastapi/folders/__init__.py index 5cb9a124e..008b8ba12 100644 --- a/seed/fastapi/folders/__init__.py +++ b/seed/fastapi/folders/__init__.py @@ -1,5 +1,5 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import a, folder +from . import a, folder __all__ = ["a", "folder"] diff --git a/seed/fastapi/folders/resources/a/resources/__init__.py b/seed/fastapi/folders/a/__init__.py similarity index 100% rename from seed/fastapi/folders/resources/a/resources/__init__.py rename to seed/fastapi/folders/a/__init__.py diff --git a/seed/fastapi/exhaustive/skip-formatting/resources/req_with_headers/__init__.py b/seed/fastapi/folders/a/b/__init__.py similarity index 100% rename from seed/fastapi/exhaustive/skip-formatting/resources/req_with_headers/__init__.py rename to seed/fastapi/folders/a/b/__init__.py diff --git a/seed/fastapi/folders/resources/a/resources/b/service/__init__.py b/seed/fastapi/folders/a/b/service/__init__.py similarity index 100% rename from seed/fastapi/folders/resources/a/resources/b/service/__init__.py rename to seed/fastapi/folders/a/b/service/__init__.py diff --git a/seed/fastapi/folders/resources/a/resources/b/service/service.py b/seed/fastapi/folders/a/b/service/service.py similarity index 92% rename from seed/fastapi/folders/resources/a/resources/b/service/service.py rename to seed/fastapi/folders/a/b/service/service.py index 9c66d66ea..4a89c89ed 100644 --- a/seed/fastapi/folders/resources/a/resources/b/service/service.py +++ b/seed/fastapi/folders/a/b/service/service.py @@ -9,9 +9,9 @@ import fastapi import starlette -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args class AbstractABService(AbstractFernService): diff --git a/seed/fastapi/folders/resources/a/resources/b/__init__.py b/seed/fastapi/folders/a/c/__init__.py similarity index 100% rename from seed/fastapi/folders/resources/a/resources/b/__init__.py rename to seed/fastapi/folders/a/c/__init__.py diff --git a/seed/fastapi/folders/resources/a/resources/c/service/__init__.py b/seed/fastapi/folders/a/c/service/__init__.py similarity index 100% rename from seed/fastapi/folders/resources/a/resources/c/service/__init__.py rename to seed/fastapi/folders/a/c/service/__init__.py diff --git a/seed/fastapi/folders/resources/a/resources/c/service/service.py b/seed/fastapi/folders/a/c/service/service.py similarity index 92% rename from seed/fastapi/folders/resources/a/resources/c/service/service.py rename to seed/fastapi/folders/a/c/service/service.py index 4aa46bd50..26b78a897 100644 --- a/seed/fastapi/folders/resources/a/resources/c/service/service.py +++ b/seed/fastapi/folders/a/c/service/service.py @@ -9,9 +9,9 @@ import fastapi import starlette -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args class AbstractACService(AbstractFernService): diff --git a/seed/fastapi/folders/resources/a/resources/d/resources/__init__.py b/seed/fastapi/folders/a/d/__init__.py similarity index 100% rename from seed/fastapi/folders/resources/a/resources/d/resources/__init__.py rename to seed/fastapi/folders/a/d/__init__.py diff --git a/seed/fastapi/folders/resources/a/resources/d/resources/types/__init__.py b/seed/fastapi/folders/a/d/types/__init__.py similarity index 100% rename from seed/fastapi/folders/resources/a/resources/d/resources/types/__init__.py rename to seed/fastapi/folders/a/d/types/__init__.py diff --git a/seed/fastapi/folders/resources/a/resources/d/resources/types/types/__init__.py b/seed/fastapi/folders/a/d/types/types/__init__.py similarity index 100% rename from seed/fastapi/folders/resources/a/resources/d/resources/types/types/__init__.py rename to seed/fastapi/folders/a/d/types/types/__init__.py diff --git a/seed/fastapi/folders/resources/a/resources/d/resources/types/types/foo.py b/seed/fastapi/folders/a/d/types/types/foo.py similarity index 94% rename from seed/fastapi/folders/resources/a/resources/d/resources/types/types/foo.py rename to seed/fastapi/folders/a/d/types/types/foo.py index a0108ae25..394c48661 100644 --- a/seed/fastapi/folders/resources/a/resources/d/resources/types/types/foo.py +++ b/seed/fastapi/folders/a/d/types/types/foo.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/folders/resources/folder/resources/__init__.py b/seed/fastapi/folders/folder/__init__.py similarity index 100% rename from seed/fastapi/folders/resources/folder/resources/__init__.py rename to seed/fastapi/folders/folder/__init__.py diff --git a/seed/fastapi/folders/resources/folder/service/__init__.py b/seed/fastapi/folders/folder/service/__init__.py similarity index 55% rename from seed/fastapi/folders/resources/folder/service/__init__.py rename to seed/fastapi/folders/folder/service/__init__.py index 96a924308..cf2549d9e 100644 --- a/seed/fastapi/folders/resources/folder/service/__init__.py +++ b/seed/fastapi/folders/folder/service/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. +from .errors import NotFoundError from .service import AbstractFolderService -__all__ = ["AbstractFolderService"] +__all__ = ["AbstractFolderService", "NotFoundError"] diff --git a/seed/fastapi/folders/resources/folder/resources/service/errors/__init__.py b/seed/fastapi/folders/folder/service/errors/__init__.py similarity index 100% rename from seed/fastapi/folders/resources/folder/resources/service/errors/__init__.py rename to seed/fastapi/folders/folder/service/errors/__init__.py diff --git a/seed/fastapi/examples/resources/types/errors/not_found_error.py b/seed/fastapi/folders/folder/service/errors/not_found_error.py similarity index 100% rename from seed/fastapi/examples/resources/types/errors/not_found_error.py rename to seed/fastapi/folders/folder/service/errors/not_found_error.py diff --git a/seed/fastapi/folders/resources/folder/service/service.py b/seed/fastapi/folders/folder/service/service.py similarity index 93% rename from seed/fastapi/folders/resources/folder/service/service.py rename to seed/fastapi/folders/folder/service/service.py index 3f812ecb1..0ceefa7d0 100644 --- a/seed/fastapi/folders/resources/folder/service/service.py +++ b/seed/fastapi/folders/folder/service/service.py @@ -9,9 +9,9 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args class AbstractFolderService(AbstractFernService): diff --git a/seed/fastapi/folders/resources/folder/resources/service/service/__init__.py b/seed/fastapi/folders/folder/service/service/__init__.py similarity index 100% rename from seed/fastapi/folders/resources/folder/resources/service/service/__init__.py rename to seed/fastapi/folders/folder/service/service/__init__.py diff --git a/seed/fastapi/folders/resources/folder/resources/service/service/service.py b/seed/fastapi/folders/folder/service/service/service.py similarity index 96% rename from seed/fastapi/folders/resources/folder/resources/service/service/service.py rename to seed/fastapi/folders/folder/service/service/service.py index a8a6bfc07..dddccf96d 100644 --- a/seed/fastapi/folders/resources/folder/resources/service/service/service.py +++ b/seed/fastapi/folders/folder/service/service/service.py @@ -9,9 +9,9 @@ import fastapi import starlette -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args from ..errors.not_found_error import NotFoundError diff --git a/seed/fastapi/folders/register.py b/seed/fastapi/folders/register.py index 3ffb9b32e..343258c6a 100644 --- a/seed/fastapi/folders/register.py +++ b/seed/fastapi/folders/register.py @@ -10,13 +10,13 @@ import starlette from fastapi import params +from .a.b.service.service import AbstractABService +from .a.c.service.service import AbstractACService from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.a.resources.b.service.service import AbstractABService -from .resources.a.resources.c.service.service import AbstractACService -from .resources.folder.resources.service.service.service import AbstractFolderServiceService -from .resources.folder.service.service import AbstractFolderService +from .folder.service.service import AbstractFolderService +from .folder.service.service.service import AbstractFolderServiceService from .service.service import AbstractRootService diff --git a/seed/fastapi/folders/resources/__init__.py b/seed/fastapi/folders/resources/__init__.py deleted file mode 100644 index 008b8ba12..000000000 --- a/seed/fastapi/folders/resources/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import a, folder - -__all__ = ["a", "folder"] diff --git a/seed/fastapi/folders/resources/a/__init__.py b/seed/fastapi/folders/resources/a/__init__.py deleted file mode 100644 index 57b251418..000000000 --- a/seed/fastapi/folders/resources/a/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import d - -__all__ = ["d"] diff --git a/seed/fastapi/folders/resources/a/resources/d/__init__.py b/seed/fastapi/folders/resources/a/resources/d/__init__.py deleted file mode 100644 index f28a62ab7..000000000 --- a/seed/fastapi/folders/resources/a/resources/d/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import Foo, types - -__all__ = ["Foo", "types"] diff --git a/seed/fastapi/folders/resources/folder/__init__.py b/seed/fastapi/folders/resources/folder/__init__.py deleted file mode 100644 index 3ae301b06..000000000 --- a/seed/fastapi/folders/resources/folder/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import NotFoundError, service - -__all__ = ["NotFoundError", "service"] diff --git a/seed/fastapi/folders/resources/folder/resources/service/__init__.py b/seed/fastapi/folders/resources/folder/resources/service/__init__.py deleted file mode 100644 index d55123ba3..000000000 --- a/seed/fastapi/folders/resources/folder/resources/service/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .errors import NotFoundError - -__all__ = ["NotFoundError"] diff --git a/seed/fastapi/idempotency-headers/__init__.py b/seed/fastapi/idempotency-headers/__init__.py index 7ea0bdcac..208a210ad 100644 --- a/seed/fastapi/idempotency-headers/__init__.py +++ b/seed/fastapi/idempotency-headers/__init__.py @@ -1,6 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import CreatePaymentRequest, Currency, payment +from . import payment +from .payment import CreatePaymentRequest, Currency from .security import ApiAuth __all__ = ["ApiAuth", "CreatePaymentRequest", "Currency", "payment"] diff --git a/seed/fastapi/idempotency-headers/resources/payment/__init__.py b/seed/fastapi/idempotency-headers/payment/__init__.py similarity index 100% rename from seed/fastapi/idempotency-headers/resources/payment/__init__.py rename to seed/fastapi/idempotency-headers/payment/__init__.py diff --git a/seed/fastapi/idempotency-headers/resources/payment/service/__init__.py b/seed/fastapi/idempotency-headers/payment/service/__init__.py similarity index 100% rename from seed/fastapi/idempotency-headers/resources/payment/service/__init__.py rename to seed/fastapi/idempotency-headers/payment/service/__init__.py diff --git a/seed/fastapi/idempotency-headers/resources/payment/service/create_payment_request.py b/seed/fastapi/idempotency-headers/payment/service/create_payment_request.py similarity index 94% rename from seed/fastapi/idempotency-headers/resources/payment/service/create_payment_request.py rename to seed/fastapi/idempotency-headers/payment/service/create_payment_request.py index 085f0870d..0cf33a525 100644 --- a/seed/fastapi/idempotency-headers/resources/payment/service/create_payment_request.py +++ b/seed/fastapi/idempotency-headers/payment/service/create_payment_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from ..types.currency import Currency try: diff --git a/seed/fastapi/idempotency-headers/resources/payment/service/service.py b/seed/fastapi/idempotency-headers/payment/service/service.py similarity index 95% rename from seed/fastapi/idempotency-headers/resources/payment/service/service.py rename to seed/fastapi/idempotency-headers/payment/service/service.py index 3dba556eb..43c4248cd 100644 --- a/seed/fastapi/idempotency-headers/resources/payment/service/service.py +++ b/seed/fastapi/idempotency-headers/payment/service/service.py @@ -10,10 +10,10 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args +from ...security import ApiAuth, FernAuth from .create_payment_request import CreatePaymentRequest diff --git a/seed/fastapi/idempotency-headers/resources/payment/types/__init__.py b/seed/fastapi/idempotency-headers/payment/types/__init__.py similarity index 100% rename from seed/fastapi/idempotency-headers/resources/payment/types/__init__.py rename to seed/fastapi/idempotency-headers/payment/types/__init__.py diff --git a/seed/fastapi/idempotency-headers/resources/payment/types/currency.py b/seed/fastapi/idempotency-headers/payment/types/currency.py similarity index 100% rename from seed/fastapi/idempotency-headers/resources/payment/types/currency.py rename to seed/fastapi/idempotency-headers/payment/types/currency.py diff --git a/seed/fastapi/idempotency-headers/register.py b/seed/fastapi/idempotency-headers/register.py index 271ee9388..5c80d105b 100644 --- a/seed/fastapi/idempotency-headers/register.py +++ b/seed/fastapi/idempotency-headers/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.payment.service.service import AbstractPaymentService +from .payment.service.service import AbstractPaymentService def register( diff --git a/seed/fastapi/idempotency-headers/resources/__init__.py b/seed/fastapi/idempotency-headers/resources/__init__.py deleted file mode 100644 index b89209d98..000000000 --- a/seed/fastapi/idempotency-headers/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import payment -from .payment import CreatePaymentRequest, Currency - -__all__ = ["CreatePaymentRequest", "Currency", "payment"] diff --git a/seed/fastapi/imdb/__init__.py b/seed/fastapi/imdb/__init__.py index dad4d8677..60f1e599e 100644 --- a/seed/fastapi/imdb/__init__.py +++ b/seed/fastapi/imdb/__init__.py @@ -1,6 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import CreateMovieRequest, Movie, MovieDoesNotExistError, MovieId, imdb +from . import imdb +from .imdb import CreateMovieRequest, Movie, MovieDoesNotExistError, MovieId from .security import ApiAuth __all__ = ["ApiAuth", "CreateMovieRequest", "Movie", "MovieDoesNotExistError", "MovieId", "imdb"] diff --git a/seed/fastapi/imdb/resources/imdb/__init__.py b/seed/fastapi/imdb/imdb/__init__.py similarity index 100% rename from seed/fastapi/imdb/resources/imdb/__init__.py rename to seed/fastapi/imdb/imdb/__init__.py diff --git a/seed/fastapi/imdb/resources/imdb/errors/__init__.py b/seed/fastapi/imdb/imdb/errors/__init__.py similarity index 100% rename from seed/fastapi/imdb/resources/imdb/errors/__init__.py rename to seed/fastapi/imdb/imdb/errors/__init__.py diff --git a/seed/fastapi/imdb/resources/imdb/errors/movie_does_not_exist_error.py b/seed/fastapi/imdb/imdb/errors/movie_does_not_exist_error.py similarity index 80% rename from seed/fastapi/imdb/resources/imdb/errors/movie_does_not_exist_error.py rename to seed/fastapi/imdb/imdb/errors/movie_does_not_exist_error.py index 492ecd752..bc889a8af 100644 --- a/seed/fastapi/imdb/resources/imdb/errors/movie_does_not_exist_error.py +++ b/seed/fastapi/imdb/imdb/errors/movie_does_not_exist_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...core.exceptions.fern_http_exception import FernHTTPException from ..types.movie_id import MovieId diff --git a/seed/fastapi/imdb/resources/imdb/service/__init__.py b/seed/fastapi/imdb/imdb/service/__init__.py similarity index 100% rename from seed/fastapi/imdb/resources/imdb/service/__init__.py rename to seed/fastapi/imdb/imdb/service/__init__.py diff --git a/seed/fastapi/imdb/resources/imdb/service/service.py b/seed/fastapi/imdb/imdb/service/service.py similarity index 96% rename from seed/fastapi/imdb/resources/imdb/service/service.py rename to seed/fastapi/imdb/imdb/service/service.py index efa554736..2dac47d42 100644 --- a/seed/fastapi/imdb/resources/imdb/service/service.py +++ b/seed/fastapi/imdb/imdb/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ..errors.movie_does_not_exist_error import MovieDoesNotExistError from ..types.create_movie_request import CreateMovieRequest from ..types.movie import Movie diff --git a/seed/fastapi/imdb/resources/imdb/types/__init__.py b/seed/fastapi/imdb/imdb/types/__init__.py similarity index 100% rename from seed/fastapi/imdb/resources/imdb/types/__init__.py rename to seed/fastapi/imdb/imdb/types/__init__.py diff --git a/seed/fastapi/imdb/resources/imdb/types/create_movie_request.py b/seed/fastapi/imdb/imdb/types/create_movie_request.py similarity index 93% rename from seed/fastapi/imdb/resources/imdb/types/create_movie_request.py rename to seed/fastapi/imdb/imdb/types/create_movie_request.py index 3d9715770..fcf172105 100644 --- a/seed/fastapi/imdb/resources/imdb/types/create_movie_request.py +++ b/seed/fastapi/imdb/imdb/types/create_movie_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/imdb/resources/imdb/types/movie.py b/seed/fastapi/imdb/imdb/types/movie.py similarity index 94% rename from seed/fastapi/imdb/resources/imdb/types/movie.py rename to seed/fastapi/imdb/imdb/types/movie.py index fcbe75c4d..7d1f88d3a 100644 --- a/seed/fastapi/imdb/resources/imdb/types/movie.py +++ b/seed/fastapi/imdb/imdb/types/movie.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .movie_id import MovieId try: diff --git a/seed/fastapi/imdb/resources/imdb/types/movie_id.py b/seed/fastapi/imdb/imdb/types/movie_id.py similarity index 94% rename from seed/fastapi/imdb/resources/imdb/types/movie_id.py rename to seed/fastapi/imdb/imdb/types/movie_id.py index 0bc5b5aec..18db2674d 100644 --- a/seed/fastapi/imdb/resources/imdb/types/movie_id.py +++ b/seed/fastapi/imdb/imdb/types/movie_id.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/imdb/register.py b/seed/fastapi/imdb/register.py index 6ca6f0daf..7675956ee 100644 --- a/seed/fastapi/imdb/register.py +++ b/seed/fastapi/imdb/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.imdb.service.service import AbstractImdbService +from .imdb.service.service import AbstractImdbService def register( diff --git a/seed/fastapi/imdb/resources/__init__.py b/seed/fastapi/imdb/resources/__init__.py deleted file mode 100644 index d316eada1..000000000 --- a/seed/fastapi/imdb/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import imdb -from .imdb import CreateMovieRequest, Movie, MovieDoesNotExistError, MovieId - -__all__ = ["CreateMovieRequest", "Movie", "MovieDoesNotExistError", "MovieId", "imdb"] diff --git a/seed/fastapi/literal/__init__.py b/seed/fastapi/literal/__init__.py index 186595960..2ca3b558e 100644 --- a/seed/fastapi/literal/__init__.py +++ b/seed/fastapi/literal/__init__.py @@ -1,13 +1,13 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import ( +from . import literal +from .literal import ( CreateOptionsRequest, CreateOptionsResponse, GetOptionsRequest, GetUndiscriminatedOptionsRequest, Options, UndiscriminatedOptions, - literal, ) __all__ = [ diff --git a/seed/fastapi/literal/resources/literal/__init__.py b/seed/fastapi/literal/literal/__init__.py similarity index 100% rename from seed/fastapi/literal/resources/literal/__init__.py rename to seed/fastapi/literal/literal/__init__.py diff --git a/seed/fastapi/literal/resources/literal/service/__init__.py b/seed/fastapi/literal/literal/service/__init__.py similarity index 100% rename from seed/fastapi/literal/resources/literal/service/__init__.py rename to seed/fastapi/literal/literal/service/__init__.py diff --git a/seed/fastapi/literal/resources/literal/service/create_options_request.py b/seed/fastapi/literal/literal/service/create_options_request.py similarity index 93% rename from seed/fastapi/literal/resources/literal/service/create_options_request.py rename to seed/fastapi/literal/literal/service/create_options_request.py index 0ba2f13d7..ad245ecd8 100644 --- a/seed/fastapi/literal/resources/literal/service/create_options_request.py +++ b/seed/fastapi/literal/literal/service/create_options_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/literal/resources/literal/service/get_options_request.py b/seed/fastapi/literal/literal/service/get_options_request.py similarity index 94% rename from seed/fastapi/literal/resources/literal/service/get_options_request.py rename to seed/fastapi/literal/literal/service/get_options_request.py index a73fb071e..57e2a9484 100644 --- a/seed/fastapi/literal/resources/literal/service/get_options_request.py +++ b/seed/fastapi/literal/literal/service/get_options_request.py @@ -5,7 +5,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/literal/resources/literal/service/get_undiscriminated_options_request.py b/seed/fastapi/literal/literal/service/get_undiscriminated_options_request.py similarity index 94% rename from seed/fastapi/literal/resources/literal/service/get_undiscriminated_options_request.py rename to seed/fastapi/literal/literal/service/get_undiscriminated_options_request.py index 60542fa5b..97f0f9727 100644 --- a/seed/fastapi/literal/resources/literal/service/get_undiscriminated_options_request.py +++ b/seed/fastapi/literal/literal/service/get_undiscriminated_options_request.py @@ -5,7 +5,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/literal/resources/literal/service/service.py b/seed/fastapi/literal/literal/service/service.py similarity index 97% rename from seed/fastapi/literal/resources/literal/service/service.py rename to seed/fastapi/literal/literal/service/service.py index aa1d99d11..1281eaf23 100644 --- a/seed/fastapi/literal/resources/literal/service/service.py +++ b/seed/fastapi/literal/literal/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ..types.create_options_response import CreateOptionsResponse from ..types.options import Options from ..types.undiscriminated_options import UndiscriminatedOptions diff --git a/seed/fastapi/literal/resources/literal/types/__init__.py b/seed/fastapi/literal/literal/types/__init__.py similarity index 100% rename from seed/fastapi/literal/resources/literal/types/__init__.py rename to seed/fastapi/literal/literal/types/__init__.py diff --git a/seed/fastapi/literal/resources/literal/types/create_options_response.py b/seed/fastapi/literal/literal/types/create_options_response.py similarity index 80% rename from seed/fastapi/literal/resources/literal/types/create_options_response.py rename to seed/fastapi/literal/literal/types/create_options_response.py index 9c5eb32a6..f9b51752a 100644 --- a/seed/fastapi/literal/resources/literal/types/create_options_response.py +++ b/seed/fastapi/literal/literal/types/create_options_response.py @@ -7,8 +7,8 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime -from .options import Options as resources_literal_types_options_Options +from ...core.datetime_utils import serialize_datetime +from .options import Options as literal_types_options_Options try: import pydantic.v1 as pydantic # type: ignore @@ -22,7 +22,7 @@ class _Factory: def ok(self, value: typing_extensions.Literal[True]) -> CreateOptionsResponse: return CreateOptionsResponse(__root__=_CreateOptionsResponse.Ok(type="ok", value=value)) - def options(self, value: resources_literal_types_options_Options) -> CreateOptionsResponse: + def options(self, value: literal_types_options_Options) -> CreateOptionsResponse: return CreateOptionsResponse( __root__=_CreateOptionsResponse.Options(**value.dict(exclude_unset=True), type="options") ) @@ -37,14 +37,12 @@ def get_as_union(self) -> typing.Union[_CreateOptionsResponse.Ok, _CreateOptions def visit( self, ok: typing.Callable[[typing_extensions.Literal[True]], T_Result], - options: typing.Callable[[resources_literal_types_options_Options], T_Result], + options: typing.Callable[[literal_types_options_Options], T_Result], ) -> T_Result: if self.__root__.type == "ok": return ok(self.__root__.value) if self.__root__.type == "options": - return options( - resources_literal_types_options_Options(**self.__root__.dict(exclude_unset=True, exclude={"type"})) - ) + return options(literal_types_options_Options(**self.__root__.dict(exclude_unset=True, exclude={"type"}))) __root__: typing_extensions.Annotated[ typing.Union[_CreateOptionsResponse.Ok, _CreateOptionsResponse.Options], pydantic.Field(discriminator="type") @@ -68,7 +66,7 @@ class Ok(pydantic.BaseModel): type: typing_extensions.Literal["ok"] value: typing_extensions.Literal[True] - class Options(resources_literal_types_options_Options): + class Options(literal_types_options_Options): type: typing_extensions.Literal["options"] class Config: diff --git a/seed/fastapi/literal/resources/literal/types/options.py b/seed/fastapi/literal/literal/types/options.py similarity index 94% rename from seed/fastapi/literal/resources/literal/types/options.py rename to seed/fastapi/literal/literal/types/options.py index 0700fda87..23c48de5c 100644 --- a/seed/fastapi/literal/resources/literal/types/options.py +++ b/seed/fastapi/literal/literal/types/options.py @@ -5,7 +5,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/literal/resources/literal/types/undiscriminated_options.py b/seed/fastapi/literal/literal/types/undiscriminated_options.py similarity index 100% rename from seed/fastapi/literal/resources/literal/types/undiscriminated_options.py rename to seed/fastapi/literal/literal/types/undiscriminated_options.py diff --git a/seed/fastapi/literal/register.py b/seed/fastapi/literal/register.py index cc075c3bb..178719b63 100644 --- a/seed/fastapi/literal/register.py +++ b/seed/fastapi/literal/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.literal.service.service import AbstractLiteralService +from .literal.service.service import AbstractLiteralService def register( diff --git a/seed/fastapi/literal/resources/__init__.py b/seed/fastapi/literal/resources/__init__.py deleted file mode 100644 index 2ca3b558e..000000000 --- a/seed/fastapi/literal/resources/__init__.py +++ /dev/null @@ -1,21 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import literal -from .literal import ( - CreateOptionsRequest, - CreateOptionsResponse, - GetOptionsRequest, - GetUndiscriminatedOptionsRequest, - Options, - UndiscriminatedOptions, -) - -__all__ = [ - "CreateOptionsRequest", - "CreateOptionsResponse", - "GetOptionsRequest", - "GetUndiscriminatedOptionsRequest", - "Options", - "UndiscriminatedOptions", - "literal", -] diff --git a/seed/fastapi/multi-url-environment/__init__.py b/seed/fastapi/multi-url-environment/__init__.py index 82bd24f41..a09cb7d09 100644 --- a/seed/fastapi/multi-url-environment/__init__.py +++ b/seed/fastapi/multi-url-environment/__init__.py @@ -1,6 +1,8 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import BootInstanceRequest, GetPresignedUrlRequest, ec_2, s_3 +from . import ec_2, s_3 +from .ec_2 import BootInstanceRequest +from .s_3 import GetPresignedUrlRequest from .security import ApiAuth __all__ = ["ApiAuth", "BootInstanceRequest", "GetPresignedUrlRequest", "ec_2", "s_3"] diff --git a/seed/fastapi/multi-url-environment/resources/ec_2/__init__.py b/seed/fastapi/multi-url-environment/ec_2/__init__.py similarity index 100% rename from seed/fastapi/multi-url-environment/resources/ec_2/__init__.py rename to seed/fastapi/multi-url-environment/ec_2/__init__.py diff --git a/seed/fastapi/multi-url-environment/resources/ec_2/service/__init__.py b/seed/fastapi/multi-url-environment/ec_2/service/__init__.py similarity index 100% rename from seed/fastapi/multi-url-environment/resources/ec_2/service/__init__.py rename to seed/fastapi/multi-url-environment/ec_2/service/__init__.py diff --git a/seed/fastapi/multi-url-environment/resources/ec_2/service/boot_instance_request.py b/seed/fastapi/multi-url-environment/ec_2/service/boot_instance_request.py similarity index 93% rename from seed/fastapi/multi-url-environment/resources/ec_2/service/boot_instance_request.py rename to seed/fastapi/multi-url-environment/ec_2/service/boot_instance_request.py index 1c192b03d..787d8f642 100644 --- a/seed/fastapi/multi-url-environment/resources/ec_2/service/boot_instance_request.py +++ b/seed/fastapi/multi-url-environment/ec_2/service/boot_instance_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/multi-url-environment/resources/ec_2/service/service.py b/seed/fastapi/multi-url-environment/ec_2/service/service.py similarity index 92% rename from seed/fastapi/multi-url-environment/resources/ec_2/service/service.py rename to seed/fastapi/multi-url-environment/ec_2/service/service.py index 1582fba71..09552abe6 100644 --- a/seed/fastapi/multi-url-environment/resources/ec_2/service/service.py +++ b/seed/fastapi/multi-url-environment/ec_2/service/service.py @@ -9,10 +9,10 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args +from ...security import ApiAuth, FernAuth from .boot_instance_request import BootInstanceRequest diff --git a/seed/fastapi/multi-url-environment/register.py b/seed/fastapi/multi-url-environment/register.py index e7b91ea63..16d57bed5 100644 --- a/seed/fastapi/multi-url-environment/register.py +++ b/seed/fastapi/multi-url-environment/register.py @@ -13,8 +13,8 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.ec_2.service.service import AbstractEc2Service -from .resources.s_3.service.service import AbstractS3Service +from .ec_2.service.service import AbstractEc2Service +from .s_3.service.service import AbstractS3Service def register( diff --git a/seed/fastapi/multi-url-environment/resources/__init__.py b/seed/fastapi/multi-url-environment/resources/__init__.py deleted file mode 100644 index 112471381..000000000 --- a/seed/fastapi/multi-url-environment/resources/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import ec_2, s_3 -from .ec_2 import BootInstanceRequest -from .s_3 import GetPresignedUrlRequest - -__all__ = ["BootInstanceRequest", "GetPresignedUrlRequest", "ec_2", "s_3"] diff --git a/seed/fastapi/multi-url-environment/resources/s_3/__init__.py b/seed/fastapi/multi-url-environment/s_3/__init__.py similarity index 100% rename from seed/fastapi/multi-url-environment/resources/s_3/__init__.py rename to seed/fastapi/multi-url-environment/s_3/__init__.py diff --git a/seed/fastapi/multi-url-environment/resources/s_3/service/__init__.py b/seed/fastapi/multi-url-environment/s_3/service/__init__.py similarity index 100% rename from seed/fastapi/multi-url-environment/resources/s_3/service/__init__.py rename to seed/fastapi/multi-url-environment/s_3/service/__init__.py diff --git a/seed/fastapi/multi-url-environment/resources/s_3/service/get_presigned_url_request.py b/seed/fastapi/multi-url-environment/s_3/service/get_presigned_url_request.py similarity index 94% rename from seed/fastapi/multi-url-environment/resources/s_3/service/get_presigned_url_request.py rename to seed/fastapi/multi-url-environment/s_3/service/get_presigned_url_request.py index fa1b5e30e..ede615855 100644 --- a/seed/fastapi/multi-url-environment/resources/s_3/service/get_presigned_url_request.py +++ b/seed/fastapi/multi-url-environment/s_3/service/get_presigned_url_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/multi-url-environment/resources/s_3/service/service.py b/seed/fastapi/multi-url-environment/s_3/service/service.py similarity index 92% rename from seed/fastapi/multi-url-environment/resources/s_3/service/service.py rename to seed/fastapi/multi-url-environment/s_3/service/service.py index 06399dcee..b0ff5ec7a 100644 --- a/seed/fastapi/multi-url-environment/resources/s_3/service/service.py +++ b/seed/fastapi/multi-url-environment/s_3/service/service.py @@ -8,10 +8,10 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args +from ...security import ApiAuth, FernAuth from .get_presigned_url_request import GetPresignedUrlRequest diff --git a/seed/fastapi/folders/resources/a/resources/c/__init__.py b/seed/fastapi/no-environment/dummy/__init__.py similarity index 100% rename from seed/fastapi/folders/resources/a/resources/c/__init__.py rename to seed/fastapi/no-environment/dummy/__init__.py diff --git a/seed/fastapi/no-environment/resources/dummy/service/__init__.py b/seed/fastapi/no-environment/dummy/service/__init__.py similarity index 100% rename from seed/fastapi/no-environment/resources/dummy/service/__init__.py rename to seed/fastapi/no-environment/dummy/service/__init__.py diff --git a/seed/fastapi/single-url-environment-default/resources/dummy/service/service.py b/seed/fastapi/no-environment/dummy/service/service.py similarity index 91% rename from seed/fastapi/single-url-environment-default/resources/dummy/service/service.py rename to seed/fastapi/no-environment/dummy/service/service.py index 1c9e86946..d4129b8ed 100644 --- a/seed/fastapi/single-url-environment-default/resources/dummy/service/service.py +++ b/seed/fastapi/no-environment/dummy/service/service.py @@ -8,10 +8,10 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args +from ...security import ApiAuth, FernAuth class AbstractDummyService(AbstractFernService): diff --git a/seed/fastapi/no-environment/register.py b/seed/fastapi/no-environment/register.py index 6751d3db6..fdd145e26 100644 --- a/seed/fastapi/no-environment/register.py +++ b/seed/fastapi/no-environment/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.dummy.service.service import AbstractDummyService +from .dummy.service.service import AbstractDummyService def register( diff --git a/seed/fastapi/objects-with-imports/__init__.py b/seed/fastapi/objects-with-imports/__init__.py index 1b71e199f..439506380 100644 --- a/seed/fastapi/objects-with-imports/__init__.py +++ b/seed/fastapi/objects-with-imports/__init__.py @@ -1,6 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import File, FileInfo, commons, file +from . import commons, file +from .file import File, FileInfo from .types import Node, Tree __all__ = ["File", "FileInfo", "Node", "Tree", "commons", "file"] diff --git a/seed/fastapi/objects-with-imports/resources/commons/resources/__init__.py b/seed/fastapi/objects-with-imports/commons/__init__.py similarity index 100% rename from seed/fastapi/objects-with-imports/resources/commons/resources/__init__.py rename to seed/fastapi/objects-with-imports/commons/__init__.py diff --git a/seed/fastapi/objects-with-imports/resources/commons/resources/metadata/__init__.py b/seed/fastapi/objects-with-imports/commons/metadata/__init__.py similarity index 100% rename from seed/fastapi/objects-with-imports/resources/commons/resources/metadata/__init__.py rename to seed/fastapi/objects-with-imports/commons/metadata/__init__.py diff --git a/seed/fastapi/objects-with-imports/resources/commons/resources/metadata/types/__init__.py b/seed/fastapi/objects-with-imports/commons/metadata/types/__init__.py similarity index 100% rename from seed/fastapi/objects-with-imports/resources/commons/resources/metadata/types/__init__.py rename to seed/fastapi/objects-with-imports/commons/metadata/types/__init__.py diff --git a/seed/fastapi/objects-with-imports/resources/commons/resources/metadata/types/metadata.py b/seed/fastapi/objects-with-imports/commons/metadata/types/metadata.py similarity index 88% rename from seed/fastapi/objects-with-imports/resources/commons/resources/metadata/types/metadata.py rename to seed/fastapi/objects-with-imports/commons/metadata/types/metadata.py index 61dd5a9c2..99d22746c 100644 --- a/seed/fastapi/objects-with-imports/resources/commons/resources/metadata/types/metadata.py +++ b/seed/fastapi/objects-with-imports/commons/metadata/types/metadata.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore @@ -13,7 +13,7 @@ class Metadata(pydantic.BaseModel): """ - from seed.objects_with_imports.resources.commons import Metadata + from seed.objects_with_imports.commons import Metadata Metadata( id="metadata-js8dg24b", diff --git a/seed/fastapi/objects-with-imports/resources/file/__init__.py b/seed/fastapi/objects-with-imports/file/__init__.py similarity index 73% rename from seed/fastapi/objects-with-imports/resources/file/__init__.py rename to seed/fastapi/objects-with-imports/file/__init__.py index 6746f4a04..86bc81c8d 100644 --- a/seed/fastapi/objects-with-imports/resources/file/__init__.py +++ b/seed/fastapi/objects-with-imports/file/__init__.py @@ -1,6 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import Directory, directory +from . import directory +from .directory import Directory from .types import File, FileInfo __all__ = ["Directory", "File", "FileInfo", "directory"] diff --git a/seed/fastapi/objects-with-imports/resources/file/resources/directory/__init__.py b/seed/fastapi/objects-with-imports/file/directory/__init__.py similarity index 100% rename from seed/fastapi/objects-with-imports/resources/file/resources/directory/__init__.py rename to seed/fastapi/objects-with-imports/file/directory/__init__.py diff --git a/seed/fastapi/objects-with-imports/resources/file/resources/directory/types/__init__.py b/seed/fastapi/objects-with-imports/file/directory/types/__init__.py similarity index 100% rename from seed/fastapi/objects-with-imports/resources/file/resources/directory/types/__init__.py rename to seed/fastapi/objects-with-imports/file/directory/types/__init__.py diff --git a/seed/fastapi/objects-with-imports/resources/file/resources/directory/types/directory.py b/seed/fastapi/objects-with-imports/file/directory/types/directory.py similarity index 91% rename from seed/fastapi/objects-with-imports/resources/file/resources/directory/types/directory.py rename to seed/fastapi/objects-with-imports/file/directory/types/directory.py index c2b6d01d1..5a1457f42 100644 --- a/seed/fastapi/objects-with-imports/resources/file/resources/directory/types/directory.py +++ b/seed/fastapi/objects-with-imports/file/directory/types/directory.py @@ -5,8 +5,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from ....types.file import File +from ....core.datetime_utils import serialize_datetime +from ...types.file import File try: import pydantic.v1 as pydantic # type: ignore @@ -17,7 +17,7 @@ class Directory(pydantic.BaseModel): """ from seed.objects_with_imports import File, FileInfo - from seed.objects_with_imports.resources.file import Directory + from seed.objects_with_imports.file import Directory Directory( name="root", diff --git a/seed/fastapi/objects-with-imports/resources/file/types/__init__.py b/seed/fastapi/objects-with-imports/file/types/__init__.py similarity index 100% rename from seed/fastapi/objects-with-imports/resources/file/types/__init__.py rename to seed/fastapi/objects-with-imports/file/types/__init__.py diff --git a/seed/fastapi/objects-with-imports/resources/file/types/file.py b/seed/fastapi/objects-with-imports/file/types/file.py similarity index 94% rename from seed/fastapi/objects-with-imports/resources/file/types/file.py rename to seed/fastapi/objects-with-imports/file/types/file.py index f33b15361..db6337aa9 100644 --- a/seed/fastapi/objects-with-imports/resources/file/types/file.py +++ b/seed/fastapi/objects-with-imports/file/types/file.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .file_info import FileInfo try: diff --git a/seed/fastapi/objects-with-imports/resources/file/types/file_info.py b/seed/fastapi/objects-with-imports/file/types/file_info.py similarity index 100% rename from seed/fastapi/objects-with-imports/resources/file/types/file_info.py rename to seed/fastapi/objects-with-imports/file/types/file_info.py diff --git a/seed/fastapi/objects-with-imports/resources/__init__.py b/seed/fastapi/objects-with-imports/resources/__init__.py deleted file mode 100644 index 73e0efa3a..000000000 --- a/seed/fastapi/objects-with-imports/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import commons, file -from .file import File, FileInfo - -__all__ = ["File", "FileInfo", "commons", "file"] diff --git a/seed/fastapi/objects-with-imports/resources/commons/__init__.py b/seed/fastapi/objects-with-imports/resources/commons/__init__.py deleted file mode 100644 index 4680e1e1f..000000000 --- a/seed/fastapi/objects-with-imports/resources/commons/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import Metadata, metadata - -__all__ = ["Metadata", "metadata"] diff --git a/seed/fastapi/objects-with-imports/types/node.py b/seed/fastapi/objects-with-imports/types/node.py index ecfccbfa3..59332b41d 100644 --- a/seed/fastapi/objects-with-imports/types/node.py +++ b/seed/fastapi/objects-with-imports/types/node.py @@ -3,8 +3,8 @@ import datetime as dt import typing +from ..commons.metadata.types.metadata import Metadata from ..core.datetime_utils import serialize_datetime -from ..resources.commons.resources.metadata.types.metadata import Metadata try: import pydantic.v1 as pydantic # type: ignore @@ -15,7 +15,7 @@ class Node(pydantic.BaseModel): """ from seed.objects_with_imports import Node - from seed.objects_with_imports.resources.commons import Metadata + from seed.objects_with_imports.commons import Metadata Node( id="node-8dvgfja2", diff --git a/seed/fastapi/objects-with-imports/types/tree.py b/seed/fastapi/objects-with-imports/types/tree.py index 941e095b8..ab4b922e9 100644 --- a/seed/fastapi/objects-with-imports/types/tree.py +++ b/seed/fastapi/objects-with-imports/types/tree.py @@ -15,7 +15,7 @@ class Tree(pydantic.BaseModel): """ from seed.objects_with_imports import Node, Tree - from seed.objects_with_imports.resources.commons import Metadata + from seed.objects_with_imports.commons import Metadata Tree( nodes=[ diff --git a/seed/fastapi/no-environment/resources/dummy/__init__.py b/seed/fastapi/optional/__init__.py similarity index 100% rename from seed/fastapi/no-environment/resources/dummy/__init__.py rename to seed/fastapi/optional/__init__.py diff --git a/seed/fastapi/optional/core/__init__.py b/seed/fastapi/optional/core/__init__.py new file mode 100644 index 000000000..60aec404e --- /dev/null +++ b/seed/fastapi/optional/core/__init__.py @@ -0,0 +1,23 @@ +# This file was auto-generated by Fern from our API Definition. + +from .datetime_utils import serialize_datetime +from .exceptions import ( + FernHTTPException, + UnauthorizedException, + default_exception_handler, + fern_http_exception_handler, + http_exception_handler, +) +from .route_args import route_args +from .security import BearerToken + +__all__ = [ + "BearerToken", + "FernHTTPException", + "UnauthorizedException", + "default_exception_handler", + "fern_http_exception_handler", + "http_exception_handler", + "route_args", + "serialize_datetime", +] diff --git a/seed/fastapi/optional/core/abstract_fern_service.py b/seed/fastapi/optional/core/abstract_fern_service.py new file mode 100644 index 000000000..da7c8dc49 --- /dev/null +++ b/seed/fastapi/optional/core/abstract_fern_service.py @@ -0,0 +1,11 @@ +# This file was auto-generated by Fern from our API Definition. + +import abc + +import fastapi + + +class AbstractFernService(abc.ABC): + @classmethod + def _init_fern(cls, router: fastapi.APIRouter) -> None: + ... diff --git a/seed/fastapi/optional/core/datetime_utils.py b/seed/fastapi/optional/core/datetime_utils.py new file mode 100644 index 000000000..7c9864a94 --- /dev/null +++ b/seed/fastapi/optional/core/datetime_utils.py @@ -0,0 +1,28 @@ +# This file was auto-generated by Fern from our API Definition. + +import datetime as dt + + +def serialize_datetime(v: dt.datetime) -> str: + """ + Serialize a datetime including timezone info. + + Uses the timezone info provided if present, otherwise uses the current runtime's timezone info. + + UTC datetimes end in "Z" while all other timezones are represented as offset from UTC, e.g. +05:00. + """ + + def _serialize_zoned_datetime(v: dt.datetime) -> str: + if v.tzinfo is not None and v.tzinfo.tzname(None) == dt.timezone.utc.tzname(None): + # UTC is a special case where we use "Z" at the end instead of "+00:00" + return v.isoformat().replace("+00:00", "Z") + else: + # Delegate to the typical +/- offset format + return v.isoformat() + + if v.tzinfo is not None: + return _serialize_zoned_datetime(v) + else: + local_tz = dt.datetime.now().astimezone().tzinfo + localized_dt = v.replace(tzinfo=local_tz) + return _serialize_zoned_datetime(localized_dt) diff --git a/seed/fastapi/optional/core/exceptions/__init__.py b/seed/fastapi/optional/core/exceptions/__init__.py new file mode 100644 index 000000000..297d6e06f --- /dev/null +++ b/seed/fastapi/optional/core/exceptions/__init__.py @@ -0,0 +1,13 @@ +# This file was auto-generated by Fern from our API Definition. + +from .fern_http_exception import FernHTTPException +from .handlers import default_exception_handler, fern_http_exception_handler, http_exception_handler +from .unauthorized import UnauthorizedException + +__all__ = [ + "FernHTTPException", + "UnauthorizedException", + "default_exception_handler", + "fern_http_exception_handler", + "http_exception_handler", +] diff --git a/seed/fastapi/optional/core/exceptions/fern_http_exception.py b/seed/fastapi/optional/core/exceptions/fern_http_exception.py new file mode 100644 index 000000000..bdf038624 --- /dev/null +++ b/seed/fastapi/optional/core/exceptions/fern_http_exception.py @@ -0,0 +1,20 @@ +# This file was auto-generated by Fern from our API Definition. + +import abc +import typing + +import fastapi + + +class FernHTTPException(abc.ABC, fastapi.HTTPException): + def __init__( + self, status_code: int, name: typing.Optional[str] = None, content: typing.Optional[typing.Any] = None + ): + super().__init__(status_code=status_code) + self.name = name + self.status_code = status_code + self.content = content + + def to_json_response(self) -> fastapi.responses.JSONResponse: + content = fastapi.encoders.jsonable_encoder(self.content, exclude_none=True) + return fastapi.responses.JSONResponse(content=content, status_code=self.status_code) diff --git a/seed/fastapi/optional/core/exceptions/handlers.py b/seed/fastapi/optional/core/exceptions/handlers.py new file mode 100644 index 000000000..fe5ac5419 --- /dev/null +++ b/seed/fastapi/optional/core/exceptions/handlers.py @@ -0,0 +1,32 @@ +# This file was auto-generated by Fern from our API Definition. + +import logging + +import fastapi +import starlette + +from .fern_http_exception import FernHTTPException + + +def fern_http_exception_handler( + request: fastapi.requests.Request, exc: FernHTTPException, skip_log: bool = False +) -> fastapi.responses.JSONResponse: + if not skip_log: + logging.getLogger(__name__).error(f"{exc.__class__.__name__} in {request.url.path}", exc_info=exc) + return exc.to_json_response() + + +def http_exception_handler( + request: fastapi.requests.Request, exc: starlette.exceptions.HTTPException, skip_log: bool = False +) -> fastapi.responses.JSONResponse: + if not skip_log: + logging.getLogger(__name__).error(f"{exc.__class__.__name__} in {request.url.path}", exc_info=exc) + return FernHTTPException(status_code=exc.status_code, content=exc.detail).to_json_response() + + +def default_exception_handler( + request: fastapi.requests.Request, exc: Exception, skip_log: bool = False +) -> fastapi.responses.JSONResponse: + if not skip_log: + logging.getLogger(__name__).error(f"{exc.__class__.__name__} in {request.url.path}", exc_info=exc) + return FernHTTPException(status_code=500, content="Internal Server Error").to_json_response() diff --git a/seed/fastapi/optional/core/exceptions/unauthorized.py b/seed/fastapi/optional/core/exceptions/unauthorized.py new file mode 100644 index 000000000..32d532e5e --- /dev/null +++ b/seed/fastapi/optional/core/exceptions/unauthorized.py @@ -0,0 +1,15 @@ +# This file was auto-generated by Fern from our API Definition. + +import typing + +from .fern_http_exception import FernHTTPException + + +class UnauthorizedException(FernHTTPException): + """ + This is the exception that is thrown by Fern when auth is not present on a + request. + """ + + def __init__(self, content: typing.Optional[str] = None) -> None: + super().__init__(status_code=401, content=content) diff --git a/seed/fastapi/optional/core/route_args.py b/seed/fastapi/optional/core/route_args.py new file mode 100644 index 000000000..4228e2fe0 --- /dev/null +++ b/seed/fastapi/optional/core/route_args.py @@ -0,0 +1,63 @@ +# This file was auto-generated by Fern from our API Definition. + +import enum +import inspect +import typing + +import typing_extensions + +T = typing.TypeVar("T", bound=typing.Callable[..., typing.Any]) + +FERN_CONFIG_KEY = "__fern" + + +class RouteArgs(typing_extensions.TypedDict): + openapi_extra: typing.Optional[typing.Dict[str, typing.Any]] + tags: typing.Optional[typing.List[typing.Union[str, enum.Enum]]] + include_in_schema: bool + + +DEFAULT_ROUTE_ARGS = RouteArgs(openapi_extra=None, tags=None, include_in_schema=True) + + +def get_route_args(endpoint_function: typing.Callable[..., typing.Any], *, default_tag: str) -> RouteArgs: + unwrapped = inspect.unwrap(endpoint_function, stop=(lambda f: hasattr(f, FERN_CONFIG_KEY))) + route_args = typing.cast(RouteArgs, getattr(unwrapped, FERN_CONFIG_KEY, DEFAULT_ROUTE_ARGS)) + if route_args["tags"] is None: + return RouteArgs( + openapi_extra=route_args["openapi_extra"], + tags=[default_tag], + include_in_schema=route_args["include_in_schema"], + ) + return route_args + + +def route_args( + openapi_extra: typing.Optional[typing.Dict[str, typing.Any]] = None, + tags: typing.Optional[typing.List[typing.Union[str, enum.Enum]]] = None, + include_in_schema: bool = True, +) -> typing.Callable[[T], T]: + """ + this decorator allows you to forward certain args to the FastAPI route decorator. + + usage: + @route_args(openapi_extra=...) + def your_endpoint_method(... + + currently supported args: + - openapi_extra + - tags + + if there's another FastAPI route arg you need to pass through, please + contact the Fern team! + """ + + def decorator(endpoint_function: T) -> T: + setattr( + endpoint_function, + FERN_CONFIG_KEY, + RouteArgs(openapi_extra=openapi_extra, tags=tags, include_in_schema=include_in_schema), + ) + return endpoint_function + + return decorator diff --git a/seed/sdk/audiences/src/seed/resources/folder_a/resources/service/__init__.py b/seed/fastapi/optional/core/security/__init__.py similarity index 53% rename from seed/sdk/audiences/src/seed/resources/folder_a/resources/service/__init__.py rename to seed/fastapi/optional/core/security/__init__.py index e49a0a3bd..e69ee6d9c 100644 --- a/seed/sdk/audiences/src/seed/resources/folder_a/resources/service/__init__.py +++ b/seed/fastapi/optional/core/security/__init__.py @@ -1,5 +1,5 @@ # This file was auto-generated by Fern from our API Definition. -from .types import Response +from .bearer import BearerToken -__all__ = ["Response"] +__all__ = ["BearerToken"] diff --git a/seed/fastapi/optional/core/security/bearer.py b/seed/fastapi/optional/core/security/bearer.py new file mode 100644 index 000000000..023342b66 --- /dev/null +++ b/seed/fastapi/optional/core/security/bearer.py @@ -0,0 +1,22 @@ +# This file was auto-generated by Fern from our API Definition. + +import fastapi + +from ..exceptions import UnauthorizedException + + +class BearerToken: + def __init__(self, token: str): + self.token = token + + +def HTTPBearer(request: fastapi.requests.Request) -> BearerToken: + authorization_header_value = request.headers.get("Authorization") + if not authorization_header_value: + raise UnauthorizedException("Missing Authorization header") + scheme, _, token = authorization_header_value.partition(" ") + if scheme.lower() != "bearer": + raise UnauthorizedException("Authorization header scheme is not bearer") + if not token: + raise UnauthorizedException("Authorization header is missing a token") + return BearerToken(token) diff --git a/seed/fastapi/package-yml/resources/service/__init__.py b/seed/fastapi/optional/optional/__init__.py similarity index 100% rename from seed/fastapi/package-yml/resources/service/__init__.py rename to seed/fastapi/optional/optional/__init__.py diff --git a/seed/fastapi/optional/optional/service/__init__.py b/seed/fastapi/optional/optional/service/__init__.py new file mode 100644 index 000000000..c66ce5f31 --- /dev/null +++ b/seed/fastapi/optional/optional/service/__init__.py @@ -0,0 +1,5 @@ +# This file was auto-generated by Fern from our API Definition. + +from .service import AbstractOptionalService + +__all__ = ["AbstractOptionalService"] diff --git a/seed/fastapi/optional/optional/service/service.py b/seed/fastapi/optional/optional/service/service.py new file mode 100644 index 000000000..09b9d8b20 --- /dev/null +++ b/seed/fastapi/optional/optional/service/service.py @@ -0,0 +1,72 @@ +# This file was auto-generated by Fern from our API Definition. + +import abc +import functools +import inspect +import logging +import typing + +import fastapi + +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args + + +class AbstractOptionalService(AbstractFernService): + """ + AbstractOptionalService is an abstract class containing the methods that you should implement. + + Each method is associated with an API route, which will be registered + with FastAPI when you register your implementation using Fern's register() + function. + """ + + @abc.abstractmethod + def send_optional_body(self, *, body: typing.Optional[typing.Dict[str, typing.Any]] = None) -> str: + ... + + """ + Below are internal methods used by Fern to register your implementation. + You can ignore them. + """ + + @classmethod + def _init_fern(cls, router: fastapi.APIRouter) -> None: + cls.__init_send_optional_body(router=router) + + @classmethod + def __init_send_optional_body(cls, router: fastapi.APIRouter) -> None: + endpoint_function = inspect.signature(cls.send_optional_body) + new_parameters: typing.List[inspect.Parameter] = [] + for index, (parameter_name, parameter) in enumerate(endpoint_function.parameters.items()): + if index == 0: + new_parameters.append(parameter.replace(default=fastapi.Depends(cls))) + elif parameter_name == "body": + new_parameters.append(parameter.replace(default=fastapi.Body(...))) + else: + new_parameters.append(parameter) + setattr(cls.send_optional_body, "__signature__", endpoint_function.replace(parameters=new_parameters)) + + @functools.wraps(cls.send_optional_body) + def wrapper(*args: typing.Any, **kwargs: typing.Any) -> str: + try: + return cls.send_optional_body(*args, **kwargs) + except FernHTTPException as e: + logging.getLogger(f"{cls.__module__}.{cls.__name__}").warn( + f"Endpoint 'send_optional_body' unexpectedly threw {e.__class__.__name__}. " + + f"If this was intentional, please add {e.__class__.__name__} to " + + "the endpoint's errors list in your Fern Definition." + ) + raise e + + # this is necessary for FastAPI to find forward-ref'ed type hints. + # https://github.com/tiangolo/fastapi/pull/5077 + wrapper.__globals__.update(cls.send_optional_body.__globals__) + + router.post( + path="//send-optional-body", + response_model=str, + description=AbstractOptionalService.send_optional_body.__doc__, + **get_route_args(cls.send_optional_body, default_tag="optional"), + )(wrapper) diff --git a/seed/fastapi/optional/register.py b/seed/fastapi/optional/register.py new file mode 100644 index 000000000..27bc20c77 --- /dev/null +++ b/seed/fastapi/optional/register.py @@ -0,0 +1,44 @@ +# This file was auto-generated by Fern from our API Definition. + +import glob +import importlib +import os +import types +import typing + +import fastapi +import starlette +from fastapi import params + +from .core.abstract_fern_service import AbstractFernService +from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler +from .core.exceptions.fern_http_exception import FernHTTPException +from .optional.service.service import AbstractOptionalService + + +def register( + _app: fastapi.FastAPI, + *, + optional: AbstractOptionalService, + dependencies: typing.Optional[typing.Sequence[params.Depends]] = None +) -> None: + _app.include_router(__register_service(optional), dependencies=dependencies) + + _app.add_exception_handler(FernHTTPException, fern_http_exception_handler) + _app.add_exception_handler(starlette.exceptions.HTTPException, http_exception_handler) + _app.add_exception_handler(Exception, default_exception_handler) + + +def __register_service(service: AbstractFernService) -> fastapi.APIRouter: + router = fastapi.APIRouter() + type(service)._init_fern(router) + return router + + +def register_validators(module: types.ModuleType) -> None: + validators_directory: str = os.path.dirname(module.__file__) # type: ignore + for path in glob.glob(os.path.join(validators_directory, "**/*.py"), recursive=True): + if os.path.isfile(path): + relative_path = os.path.relpath(path, start=validators_directory) + module_path = ".".join([module.__name__] + relative_path[:-3].split("/")) + importlib.import_module(module_path) diff --git a/seed/fastapi/optional/snippet.json b/seed/fastapi/optional/snippet.json new file mode 100644 index 000000000..e69de29bb diff --git a/seed/fastapi/package-yml/register.py b/seed/fastapi/package-yml/register.py index 99f1eba2d..360bf7b8b 100644 --- a/seed/fastapi/package-yml/register.py +++ b/seed/fastapi/package-yml/register.py @@ -13,8 +13,8 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.service.service.service import AbstractServiceService from .service.service import AbstractRootService +from .service.service.service import AbstractServiceService def register( diff --git a/seed/fastapi/package-yml/resources/service/service/__init__.py b/seed/fastapi/package-yml/service/service/__init__.py similarity index 100% rename from seed/fastapi/package-yml/resources/service/service/__init__.py rename to seed/fastapi/package-yml/service/service/__init__.py diff --git a/seed/fastapi/package-yml/resources/service/service/service.py b/seed/fastapi/package-yml/service/service/service.py similarity index 93% rename from seed/fastapi/package-yml/resources/service/service/service.py rename to seed/fastapi/package-yml/service/service/service.py index 0a8ba159f..767733ddf 100644 --- a/seed/fastapi/package-yml/resources/service/service/service.py +++ b/seed/fastapi/package-yml/service/service/service.py @@ -9,9 +9,9 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args class AbstractServiceService(AbstractFernService): diff --git a/seed/fastapi/plain-text/register.py b/seed/fastapi/plain-text/register.py index e0d14dcfb..98c6ce410 100644 --- a/seed/fastapi/plain-text/register.py +++ b/seed/fastapi/plain-text/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.service.service.service import AbstractServiceService +from .service.service.service import AbstractServiceService def register( diff --git a/seed/fastapi/plain-text/resources/service/__init__.py b/seed/fastapi/plain-text/service/__init__.py similarity index 100% rename from seed/fastapi/plain-text/resources/service/__init__.py rename to seed/fastapi/plain-text/service/__init__.py diff --git a/seed/fastapi/plain-text/resources/service/service/__init__.py b/seed/fastapi/plain-text/service/service/__init__.py similarity index 100% rename from seed/fastapi/plain-text/resources/service/service/__init__.py rename to seed/fastapi/plain-text/service/service/__init__.py diff --git a/seed/fastapi/plain-text/resources/service/service/service.py b/seed/fastapi/plain-text/service/service/service.py similarity index 93% rename from seed/fastapi/plain-text/resources/service/service/service.py rename to seed/fastapi/plain-text/service/service/service.py index 66f877e05..3c0651d7c 100644 --- a/seed/fastapi/plain-text/resources/service/service/service.py +++ b/seed/fastapi/plain-text/service/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args class AbstractServiceService(AbstractFernService): diff --git a/seed/fastapi/reserved-keywords/__init__.py b/seed/fastapi/reserved-keywords/__init__.py index 381914ba8..7e5029473 100644 --- a/seed/fastapi/reserved-keywords/__init__.py +++ b/seed/fastapi/reserved-keywords/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import Package, Record, package +from . import package +from .package import Package, Record __all__ = ["Package", "Record", "package"] diff --git a/seed/fastapi/reserved-keywords/resources/package/__init__.py b/seed/fastapi/reserved-keywords/package/__init__.py similarity index 100% rename from seed/fastapi/reserved-keywords/resources/package/__init__.py rename to seed/fastapi/reserved-keywords/package/__init__.py diff --git a/seed/fastapi/reserved-keywords/resources/package/service/__init__.py b/seed/fastapi/reserved-keywords/package/service/__init__.py similarity index 100% rename from seed/fastapi/reserved-keywords/resources/package/service/__init__.py rename to seed/fastapi/reserved-keywords/package/service/__init__.py diff --git a/seed/fastapi/reserved-keywords/resources/package/service/service.py b/seed/fastapi/reserved-keywords/package/service/service.py similarity index 93% rename from seed/fastapi/reserved-keywords/resources/package/service/service.py rename to seed/fastapi/reserved-keywords/package/service/service.py index cee463167..7eb712d4a 100644 --- a/seed/fastapi/reserved-keywords/resources/package/service/service.py +++ b/seed/fastapi/reserved-keywords/package/service/service.py @@ -9,9 +9,9 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args class AbstractPackageService(AbstractFernService): diff --git a/seed/fastapi/reserved-keywords/resources/package/types/__init__.py b/seed/fastapi/reserved-keywords/package/types/__init__.py similarity index 100% rename from seed/fastapi/reserved-keywords/resources/package/types/__init__.py rename to seed/fastapi/reserved-keywords/package/types/__init__.py diff --git a/seed/fastapi/reserved-keywords/resources/package/types/package.py b/seed/fastapi/reserved-keywords/package/types/package.py similarity index 93% rename from seed/fastapi/reserved-keywords/resources/package/types/package.py rename to seed/fastapi/reserved-keywords/package/types/package.py index 3de24a06e..467c92ab3 100644 --- a/seed/fastapi/reserved-keywords/resources/package/types/package.py +++ b/seed/fastapi/reserved-keywords/package/types/package.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/reserved-keywords/resources/package/types/record.py b/seed/fastapi/reserved-keywords/package/types/record.py similarity index 94% rename from seed/fastapi/reserved-keywords/resources/package/types/record.py rename to seed/fastapi/reserved-keywords/package/types/record.py index 81f243c0f..39ede5347 100644 --- a/seed/fastapi/reserved-keywords/resources/package/types/record.py +++ b/seed/fastapi/reserved-keywords/package/types/record.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/reserved-keywords/register.py b/seed/fastapi/reserved-keywords/register.py index 8a338abd1..a9a6b11ad 100644 --- a/seed/fastapi/reserved-keywords/register.py +++ b/seed/fastapi/reserved-keywords/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.package.service.service import AbstractPackageService +from .package.service.service import AbstractPackageService def register( diff --git a/seed/fastapi/reserved-keywords/resources/__init__.py b/seed/fastapi/reserved-keywords/resources/__init__.py deleted file mode 100644 index 7e5029473..000000000 --- a/seed/fastapi/reserved-keywords/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import package -from .package import Package, Record - -__all__ = ["Package", "Record", "package"] diff --git a/seed/fastapi/seed.yml b/seed/fastapi/seed.yml index adcec36c5..3ac841299 100644 --- a/seed/fastapi/seed.yml +++ b/seed/fastapi/seed.yml @@ -19,3 +19,10 @@ fixtures: pydantic_config: version: v2 outputFolder: pydantic-v2 +allowedFailures: + - bytes + - file-download + - file-upload + - literal-headers + - response-property + - streaming diff --git a/seed/fastapi/single-url-environment-default/resources/dummy/__init__.py b/seed/fastapi/single-url-environment-default/dummy/__init__.py similarity index 100% rename from seed/fastapi/single-url-environment-default/resources/dummy/__init__.py rename to seed/fastapi/single-url-environment-default/dummy/__init__.py diff --git a/seed/fastapi/single-url-environment-default/resources/dummy/service/__init__.py b/seed/fastapi/single-url-environment-default/dummy/service/__init__.py similarity index 100% rename from seed/fastapi/single-url-environment-default/resources/dummy/service/__init__.py rename to seed/fastapi/single-url-environment-default/dummy/service/__init__.py diff --git a/seed/fastapi/no-environment/resources/dummy/service/service.py b/seed/fastapi/single-url-environment-default/dummy/service/service.py similarity index 91% rename from seed/fastapi/no-environment/resources/dummy/service/service.py rename to seed/fastapi/single-url-environment-default/dummy/service/service.py index 1c9e86946..d4129b8ed 100644 --- a/seed/fastapi/no-environment/resources/dummy/service/service.py +++ b/seed/fastapi/single-url-environment-default/dummy/service/service.py @@ -8,10 +8,10 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args +from ...security import ApiAuth, FernAuth class AbstractDummyService(AbstractFernService): diff --git a/seed/fastapi/single-url-environment-default/register.py b/seed/fastapi/single-url-environment-default/register.py index 6751d3db6..fdd145e26 100644 --- a/seed/fastapi/single-url-environment-default/register.py +++ b/seed/fastapi/single-url-environment-default/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.dummy.service.service import AbstractDummyService +from .dummy.service.service import AbstractDummyService def register( diff --git a/seed/fastapi/single-url-environment-no-default/resources/dummy/__init__.py b/seed/fastapi/single-url-environment-no-default/dummy/__init__.py similarity index 100% rename from seed/fastapi/single-url-environment-no-default/resources/dummy/__init__.py rename to seed/fastapi/single-url-environment-no-default/dummy/__init__.py diff --git a/seed/fastapi/single-url-environment-no-default/resources/dummy/service/__init__.py b/seed/fastapi/single-url-environment-no-default/dummy/service/__init__.py similarity index 100% rename from seed/fastapi/single-url-environment-no-default/resources/dummy/service/__init__.py rename to seed/fastapi/single-url-environment-no-default/dummy/service/__init__.py diff --git a/seed/fastapi/single-url-environment-no-default/resources/dummy/service/service.py b/seed/fastapi/single-url-environment-no-default/dummy/service/service.py similarity index 91% rename from seed/fastapi/single-url-environment-no-default/resources/dummy/service/service.py rename to seed/fastapi/single-url-environment-no-default/dummy/service/service.py index 1c9e86946..d4129b8ed 100644 --- a/seed/fastapi/single-url-environment-no-default/resources/dummy/service/service.py +++ b/seed/fastapi/single-url-environment-no-default/dummy/service/service.py @@ -8,10 +8,10 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args +from ...security import ApiAuth, FernAuth class AbstractDummyService(AbstractFernService): diff --git a/seed/fastapi/single-url-environment-no-default/register.py b/seed/fastapi/single-url-environment-no-default/register.py index 6751d3db6..fdd145e26 100644 --- a/seed/fastapi/single-url-environment-no-default/register.py +++ b/seed/fastapi/single-url-environment-no-default/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.dummy.service.service import AbstractDummyService +from .dummy.service.service import AbstractDummyService def register( diff --git a/seed/fastapi/trace/__init__.py b/seed/fastapi/trace/__init__.py index 5c1a97080..2fe0d91e2 100644 --- a/seed/fastapi/trace/__init__.py +++ b/seed/fastapi/trace/__init__.py @@ -1,23 +1,68 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import ( - ActualResult, +from . import admin, commons, lang_server, migration, playlist, problem, submission, v_2 +from .admin import StoreTracedTestCaseRequest, StoreTracedWorkspaceRequest, Test +from .commons import ( BinaryTreeNodeAndTreeValue, BinaryTreeNodeValue, BinaryTreeValue, - BuildingExecutorResponse, - CodeExecutionUpdate, - CompileError, - CreateProblemError, - CreateProblemRequest, - CreateProblemResponse, - CustomTestCasesUnsupported, DebugKeyValuePairs, DebugMapValue, DebugVariableValue, DoublyLinkedListNodeAndListValue, DoublyLinkedListNodeValue, DoublyLinkedListValue, + FileInfo, + GenericValue, + KeyValuePair, + Language, + ListType, + MapType, + MapValue, + NodeId, + ProblemId, + SinglyLinkedListNodeAndListValue, + SinglyLinkedListNodeValue, + SinglyLinkedListValue, + TestCase, + TestCaseWithExpectedResult, + UserId, + VariableType, + VariableValue, +) +from .lang_server import LangServerRequest, LangServerResponse +from .migration import Migration, MigrationStatus +from .playlist import ( + Playlist, + PlaylistCreateRequest, + PlaylistId, + PlaylistIdNotFoundError, + PlaylistIdNotFoundErrorBody, + ReservedKeywordEnum, + UnauthorizedError, + UpdatePlaylistRequest, +) +from .problem import ( + CreateProblemError, + CreateProblemRequest, + CreateProblemResponse, + GenericCreateProblemError, + GetDefaultStarterFilesRequest, + GetDefaultStarterFilesResponse, + ProblemDescription, + ProblemDescriptionBoard, + ProblemFiles, + ProblemInfo, + UpdateProblemResponse, + VariableTypeAndName, +) +from .security import ApiAuth +from .submission import ( + ActualResult, + BuildingExecutorResponse, + CodeExecutionUpdate, + CompileError, + CustomTestCasesUnsupported, ErrorInfo, ErroredResponse, ExceptionInfo, @@ -27,12 +72,7 @@ ExecutionSessionStatus, ExistingSubmissionExecuting, ExpressionLocation, - FileInfo, FinishedResponse, - GenericCreateProblemError, - GenericValue, - GetDefaultStarterFilesRequest, - GetDefaultStarterFilesResponse, GetExecutionSessionStateResponse, GetSubmissionStateResponse, GetTraceResponsesPageRequest, @@ -43,47 +83,21 @@ InternalError, InvalidRequestCause, InvalidRequestResponse, - KeyValuePair, - LangServerRequest, - LangServerResponse, - Language, LightweightStackframeInformation, - ListType, - MapType, - MapValue, - Migration, - MigrationStatus, - NodeId, - Playlist, - PlaylistCreateRequest, - PlaylistId, - PlaylistIdNotFoundError, - PlaylistIdNotFoundErrorBody, - ProblemDescription, - ProblemDescriptionBoard, - ProblemFiles, - ProblemId, - ProblemInfo, RecordedResponseNotification, RecordedTestCaseUpdate, RecordingResponseNotification, - ReservedKeywordEnum, RunningResponse, RunningSubmissionState, RuntimeError, Scope, ShareId, - SinglyLinkedListNodeAndListValue, - SinglyLinkedListNodeValue, - SinglyLinkedListValue, StackFrame, StackInformation, StderrResponse, StdoutResponse, StopRequest, StoppedResponse, - StoreTracedTestCaseRequest, - StoreTracedWorkspaceRequest, SubmissionFileInfo, SubmissionId, SubmissionIdNotFound, @@ -95,14 +109,11 @@ SubmissionTypeState, SubmitRequestV2, TerminatedResponse, - Test, - TestCase, TestCaseGrade, TestCaseHiddenGrade, TestCaseNonHiddenGrade, TestCaseResult, TestCaseResultWithStdout, - TestCaseWithExpectedResult, TestSubmissionState, TestSubmissionStatus, TestSubmissionStatusV2, @@ -114,14 +125,7 @@ TraceResponsesPageV2, TracedFile, TracedTestCase, - UnauthorizedError, UnexpectedLanguageError, - UpdatePlaylistRequest, - UpdateProblemResponse, - UserId, - VariableType, - VariableTypeAndName, - VariableValue, WorkspaceFiles, WorkspaceRanResponse, WorkspaceRunDetails, @@ -134,16 +138,7 @@ WorkspaceSubmissionUpdateInfo, WorkspaceSubmitRequest, WorkspaceTracedUpdate, - admin, - commons, - lang_server, - migration, - playlist, - problem, - submission, - v_2, ) -from .security import ApiAuth __all__ = [ "ActualResult", diff --git a/seed/fastapi/trace/resources/admin/__init__.py b/seed/fastapi/trace/admin/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/admin/__init__.py rename to seed/fastapi/trace/admin/__init__.py diff --git a/seed/fastapi/trace/resources/admin/service/__init__.py b/seed/fastapi/trace/admin/service/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/admin/service/__init__.py rename to seed/fastapi/trace/admin/service/__init__.py diff --git a/seed/fastapi/trace/resources/admin/service/service.py b/seed/fastapi/trace/admin/service/service.py similarity index 99% rename from seed/fastapi/trace/resources/admin/service/service.py rename to seed/fastapi/trace/admin/service/service.py index ef3fc63d3..3516a5ec1 100644 --- a/seed/fastapi/trace/resources/admin/service/service.py +++ b/seed/fastapi/trace/admin/service/service.py @@ -10,9 +10,9 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ...submission.types.test_submission_status import TestSubmissionStatus from ...submission.types.test_submission_update import TestSubmissionUpdate from ...submission.types.trace_response_v_2 import TraceResponseV2 diff --git a/seed/fastapi/trace/resources/admin/service/store_traced_test_case_request.py b/seed/fastapi/trace/admin/service/store_traced_test_case_request.py similarity index 95% rename from seed/fastapi/trace/resources/admin/service/store_traced_test_case_request.py rename to seed/fastapi/trace/admin/service/store_traced_test_case_request.py index bfdfea1b9..d6def06aa 100644 --- a/seed/fastapi/trace/resources/admin/service/store_traced_test_case_request.py +++ b/seed/fastapi/trace/admin/service/store_traced_test_case_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from ...submission.types.test_case_result_with_stdout import TestCaseResultWithStdout from ...submission.types.trace_response import TraceResponse diff --git a/seed/fastapi/trace/resources/admin/service/store_traced_workspace_request.py b/seed/fastapi/trace/admin/service/store_traced_workspace_request.py similarity index 95% rename from seed/fastapi/trace/resources/admin/service/store_traced_workspace_request.py rename to seed/fastapi/trace/admin/service/store_traced_workspace_request.py index 591bfba3f..c1a7ecdd6 100644 --- a/seed/fastapi/trace/resources/admin/service/store_traced_workspace_request.py +++ b/seed/fastapi/trace/admin/service/store_traced_workspace_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from ...submission.types.trace_response import TraceResponse from ...submission.types.workspace_run_details import WorkspaceRunDetails diff --git a/seed/fastapi/trace/resources/admin/types/__init__.py b/seed/fastapi/trace/admin/types/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/admin/types/__init__.py rename to seed/fastapi/trace/admin/types/__init__.py diff --git a/seed/fastapi/trace/resources/admin/types/test.py b/seed/fastapi/trace/admin/types/test.py similarity index 97% rename from seed/fastapi/trace/resources/admin/types/test.py rename to seed/fastapi/trace/admin/types/test.py index 162d88654..09908965b 100644 --- a/seed/fastapi/trace/resources/admin/types/test.py +++ b/seed/fastapi/trace/admin/types/test.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/commons/__init__.py b/seed/fastapi/trace/commons/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/commons/__init__.py rename to seed/fastapi/trace/commons/__init__.py diff --git a/seed/fastapi/trace/resources/commons/types/__init__.py b/seed/fastapi/trace/commons/types/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/commons/types/__init__.py rename to seed/fastapi/trace/commons/types/__init__.py diff --git a/seed/fastapi/trace/resources/commons/types/binary_tree_node_and_tree_value.py b/seed/fastapi/trace/commons/types/binary_tree_node_and_tree_value.py similarity index 95% rename from seed/fastapi/trace/resources/commons/types/binary_tree_node_and_tree_value.py rename to seed/fastapi/trace/commons/types/binary_tree_node_and_tree_value.py index 3fad1b3c4..961916a65 100644 --- a/seed/fastapi/trace/resources/commons/types/binary_tree_node_and_tree_value.py +++ b/seed/fastapi/trace/commons/types/binary_tree_node_and_tree_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .binary_tree_value import BinaryTreeValue from .node_id import NodeId diff --git a/seed/fastapi/trace/resources/commons/types/binary_tree_node_value.py b/seed/fastapi/trace/commons/types/binary_tree_node_value.py similarity index 94% rename from seed/fastapi/trace/resources/commons/types/binary_tree_node_value.py rename to seed/fastapi/trace/commons/types/binary_tree_node_value.py index 984f219c5..1b47635e3 100644 --- a/seed/fastapi/trace/resources/commons/types/binary_tree_node_value.py +++ b/seed/fastapi/trace/commons/types/binary_tree_node_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .node_id import NodeId try: diff --git a/seed/fastapi/trace/resources/commons/types/binary_tree_value.py b/seed/fastapi/trace/commons/types/binary_tree_value.py similarity index 94% rename from seed/fastapi/trace/resources/commons/types/binary_tree_value.py rename to seed/fastapi/trace/commons/types/binary_tree_value.py index fb5f0b27a..d761af566 100644 --- a/seed/fastapi/trace/resources/commons/types/binary_tree_value.py +++ b/seed/fastapi/trace/commons/types/binary_tree_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .binary_tree_node_value import BinaryTreeNodeValue from .node_id import NodeId diff --git a/seed/fastapi/trace/resources/commons/types/debug_key_value_pairs.py b/seed/fastapi/trace/commons/types/debug_key_value_pairs.py similarity index 94% rename from seed/fastapi/trace/resources/commons/types/debug_key_value_pairs.py rename to seed/fastapi/trace/commons/types/debug_key_value_pairs.py index 12b001531..858c35ca7 100644 --- a/seed/fastapi/trace/resources/commons/types/debug_key_value_pairs.py +++ b/seed/fastapi/trace/commons/types/debug_key_value_pairs.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/commons/types/debug_map_value.py b/seed/fastapi/trace/commons/types/debug_map_value.py similarity index 95% rename from seed/fastapi/trace/resources/commons/types/debug_map_value.py rename to seed/fastapi/trace/commons/types/debug_map_value.py index dd1a4cd5f..967a9f05b 100644 --- a/seed/fastapi/trace/resources/commons/types/debug_map_value.py +++ b/seed/fastapi/trace/commons/types/debug_map_value.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/commons/types/debug_variable_value.py b/seed/fastapi/trace/commons/types/debug_variable_value.py similarity index 94% rename from seed/fastapi/trace/resources/commons/types/debug_variable_value.py rename to seed/fastapi/trace/commons/types/debug_variable_value.py index 519be2f28..a1cac8e77 100644 --- a/seed/fastapi/trace/resources/commons/types/debug_variable_value.py +++ b/seed/fastapi/trace/commons/types/debug_variable_value.py @@ -7,10 +7,10 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .binary_tree_node_and_tree_value import BinaryTreeNodeAndTreeValue from .doubly_linked_list_node_and_list_value import DoublyLinkedListNodeAndListValue -from .generic_value import GenericValue as resources_commons_types_generic_value_GenericValue +from .generic_value import GenericValue as commons_types_generic_value_GenericValue from .singly_linked_list_node_and_list_value import SinglyLinkedListNodeAndListValue try: @@ -72,7 +72,7 @@ def undefined_value(self) -> DebugVariableValue: def null_value(self) -> DebugVariableValue: return DebugVariableValue(__root__=_DebugVariableValue.NullValue(type="nullValue")) - def generic_value(self, value: resources_commons_types_generic_value_GenericValue) -> DebugVariableValue: + def generic_value(self, value: commons_types_generic_value_GenericValue) -> DebugVariableValue: return DebugVariableValue( __root__=_DebugVariableValue.GenericValue(**value.dict(exclude_unset=True), type="genericValue") ) @@ -114,7 +114,7 @@ def visit( doubly_linked_list_node_value: typing.Callable[[DoublyLinkedListNodeAndListValue], T_Result], undefined_value: typing.Callable[[], T_Result], null_value: typing.Callable[[], T_Result], - generic_value: typing.Callable[[resources_commons_types_generic_value_GenericValue], T_Result], + generic_value: typing.Callable[[commons_types_generic_value_GenericValue], T_Result], ) -> T_Result: if self.__root__.type == "integerValue": return integer_value(self.__root__.value) @@ -148,9 +148,7 @@ def visit( return null_value() if self.__root__.type == "genericValue": return generic_value( - resources_commons_types_generic_value_GenericValue( - **self.__root__.dict(exclude_unset=True, exclude={"type"}) - ) + commons_types_generic_value_GenericValue(**self.__root__.dict(exclude_unset=True, exclude={"type"})) ) __root__: typing_extensions.Annotated[ @@ -244,7 +242,7 @@ class UndefinedValue(pydantic.BaseModel): class NullValue(pydantic.BaseModel): type: typing_extensions.Literal["nullValue"] - class GenericValue(resources_commons_types_generic_value_GenericValue): + class GenericValue(commons_types_generic_value_GenericValue): type: typing_extensions.Literal["genericValue"] class Config: diff --git a/seed/fastapi/trace/resources/commons/types/doubly_linked_list_node_and_list_value.py b/seed/fastapi/trace/commons/types/doubly_linked_list_node_and_list_value.py similarity index 95% rename from seed/fastapi/trace/resources/commons/types/doubly_linked_list_node_and_list_value.py rename to seed/fastapi/trace/commons/types/doubly_linked_list_node_and_list_value.py index 5bdf7ccd0..e897f73de 100644 --- a/seed/fastapi/trace/resources/commons/types/doubly_linked_list_node_and_list_value.py +++ b/seed/fastapi/trace/commons/types/doubly_linked_list_node_and_list_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .doubly_linked_list_value import DoublyLinkedListValue from .node_id import NodeId diff --git a/seed/fastapi/trace/resources/commons/types/doubly_linked_list_node_value.py b/seed/fastapi/trace/commons/types/doubly_linked_list_node_value.py similarity index 94% rename from seed/fastapi/trace/resources/commons/types/doubly_linked_list_node_value.py rename to seed/fastapi/trace/commons/types/doubly_linked_list_node_value.py index 89f8a8f55..e7b7de35b 100644 --- a/seed/fastapi/trace/resources/commons/types/doubly_linked_list_node_value.py +++ b/seed/fastapi/trace/commons/types/doubly_linked_list_node_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .node_id import NodeId try: diff --git a/seed/fastapi/trace/resources/commons/types/doubly_linked_list_value.py b/seed/fastapi/trace/commons/types/doubly_linked_list_value.py similarity index 94% rename from seed/fastapi/trace/resources/commons/types/doubly_linked_list_value.py rename to seed/fastapi/trace/commons/types/doubly_linked_list_value.py index 0a377a963..77350036f 100644 --- a/seed/fastapi/trace/resources/commons/types/doubly_linked_list_value.py +++ b/seed/fastapi/trace/commons/types/doubly_linked_list_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .doubly_linked_list_node_value import DoublyLinkedListNodeValue from .node_id import NodeId diff --git a/seed/fastapi/trace/resources/commons/types/file_info.py b/seed/fastapi/trace/commons/types/file_info.py similarity index 93% rename from seed/fastapi/trace/resources/commons/types/file_info.py rename to seed/fastapi/trace/commons/types/file_info.py index 3189fd8b4..e3c26a1c9 100644 --- a/seed/fastapi/trace/resources/commons/types/file_info.py +++ b/seed/fastapi/trace/commons/types/file_info.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/commons/types/generic_value.py b/seed/fastapi/trace/commons/types/generic_value.py similarity index 94% rename from seed/fastapi/trace/resources/commons/types/generic_value.py rename to seed/fastapi/trace/commons/types/generic_value.py index dede691e1..6f7c5c9a0 100644 --- a/seed/fastapi/trace/resources/commons/types/generic_value.py +++ b/seed/fastapi/trace/commons/types/generic_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/commons/types/key_value_pair.py b/seed/fastapi/trace/commons/types/key_value_pair.py similarity index 94% rename from seed/fastapi/trace/resources/commons/types/key_value_pair.py rename to seed/fastapi/trace/commons/types/key_value_pair.py index 471ef24e6..f659baa5e 100644 --- a/seed/fastapi/trace/resources/commons/types/key_value_pair.py +++ b/seed/fastapi/trace/commons/types/key_value_pair.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/commons/types/language.py b/seed/fastapi/trace/commons/types/language.py similarity index 100% rename from seed/fastapi/trace/resources/commons/types/language.py rename to seed/fastapi/trace/commons/types/language.py diff --git a/seed/fastapi/trace/resources/commons/types/list_type.py b/seed/fastapi/trace/commons/types/list_type.py similarity index 95% rename from seed/fastapi/trace/resources/commons/types/list_type.py rename to seed/fastapi/trace/commons/types/list_type.py index ba1f657ea..981371913 100644 --- a/seed/fastapi/trace/resources/commons/types/list_type.py +++ b/seed/fastapi/trace/commons/types/list_type.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/commons/types/map_type.py b/seed/fastapi/trace/commons/types/map_type.py similarity index 95% rename from seed/fastapi/trace/resources/commons/types/map_type.py rename to seed/fastapi/trace/commons/types/map_type.py index 795cc2c72..18c30a05c 100644 --- a/seed/fastapi/trace/resources/commons/types/map_type.py +++ b/seed/fastapi/trace/commons/types/map_type.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/commons/types/map_value.py b/seed/fastapi/trace/commons/types/map_value.py similarity index 95% rename from seed/fastapi/trace/resources/commons/types/map_value.py rename to seed/fastapi/trace/commons/types/map_value.py index 90d098f03..6b2e2df9f 100644 --- a/seed/fastapi/trace/resources/commons/types/map_value.py +++ b/seed/fastapi/trace/commons/types/map_value.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/commons/types/node_id.py b/seed/fastapi/trace/commons/types/node_id.py similarity index 94% rename from seed/fastapi/trace/resources/commons/types/node_id.py rename to seed/fastapi/trace/commons/types/node_id.py index e1c73d887..c5ebf1599 100644 --- a/seed/fastapi/trace/resources/commons/types/node_id.py +++ b/seed/fastapi/trace/commons/types/node_id.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/commons/types/problem_id.py b/seed/fastapi/trace/commons/types/problem_id.py similarity index 94% rename from seed/fastapi/trace/resources/commons/types/problem_id.py rename to seed/fastapi/trace/commons/types/problem_id.py index a88005ffb..dd37cd6bb 100644 --- a/seed/fastapi/trace/resources/commons/types/problem_id.py +++ b/seed/fastapi/trace/commons/types/problem_id.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/commons/types/singly_linked_list_node_and_list_value.py b/seed/fastapi/trace/commons/types/singly_linked_list_node_and_list_value.py similarity index 95% rename from seed/fastapi/trace/resources/commons/types/singly_linked_list_node_and_list_value.py rename to seed/fastapi/trace/commons/types/singly_linked_list_node_and_list_value.py index aba739fc8..4add00b6c 100644 --- a/seed/fastapi/trace/resources/commons/types/singly_linked_list_node_and_list_value.py +++ b/seed/fastapi/trace/commons/types/singly_linked_list_node_and_list_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .node_id import NodeId from .singly_linked_list_value import SinglyLinkedListValue diff --git a/seed/fastapi/trace/resources/commons/types/singly_linked_list_node_value.py b/seed/fastapi/trace/commons/types/singly_linked_list_node_value.py similarity index 94% rename from seed/fastapi/trace/resources/commons/types/singly_linked_list_node_value.py rename to seed/fastapi/trace/commons/types/singly_linked_list_node_value.py index 44226aaa1..3d378aec5 100644 --- a/seed/fastapi/trace/resources/commons/types/singly_linked_list_node_value.py +++ b/seed/fastapi/trace/commons/types/singly_linked_list_node_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .node_id import NodeId try: diff --git a/seed/fastapi/trace/resources/commons/types/singly_linked_list_value.py b/seed/fastapi/trace/commons/types/singly_linked_list_value.py similarity index 94% rename from seed/fastapi/trace/resources/commons/types/singly_linked_list_value.py rename to seed/fastapi/trace/commons/types/singly_linked_list_value.py index def1cb823..0ea040c47 100644 --- a/seed/fastapi/trace/resources/commons/types/singly_linked_list_value.py +++ b/seed/fastapi/trace/commons/types/singly_linked_list_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .node_id import NodeId from .singly_linked_list_node_value import SinglyLinkedListNodeValue diff --git a/seed/fastapi/trace/resources/commons/types/test_case.py b/seed/fastapi/trace/commons/types/test_case.py similarity index 94% rename from seed/fastapi/trace/resources/commons/types/test_case.py rename to seed/fastapi/trace/commons/types/test_case.py index d3779ab1a..c7fd7394c 100644 --- a/seed/fastapi/trace/resources/commons/types/test_case.py +++ b/seed/fastapi/trace/commons/types/test_case.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .variable_value import VariableValue try: diff --git a/seed/fastapi/trace/resources/commons/types/test_case_with_expected_result.py b/seed/fastapi/trace/commons/types/test_case_with_expected_result.py similarity index 95% rename from seed/fastapi/trace/resources/commons/types/test_case_with_expected_result.py rename to seed/fastapi/trace/commons/types/test_case_with_expected_result.py index fad43185f..db2b36fbd 100644 --- a/seed/fastapi/trace/resources/commons/types/test_case_with_expected_result.py +++ b/seed/fastapi/trace/commons/types/test_case_with_expected_result.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .test_case import TestCase from .variable_value import VariableValue diff --git a/seed/fastapi/trace/resources/commons/types/user_id.py b/seed/fastapi/trace/commons/types/user_id.py similarity index 94% rename from seed/fastapi/trace/resources/commons/types/user_id.py rename to seed/fastapi/trace/commons/types/user_id.py index 5bf261909..78cdbc2ed 100644 --- a/seed/fastapi/trace/resources/commons/types/user_id.py +++ b/seed/fastapi/trace/commons/types/user_id.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/commons/types/variable_type.py b/seed/fastapi/trace/commons/types/variable_type.py similarity index 81% rename from seed/fastapi/trace/resources/commons/types/variable_type.py rename to seed/fastapi/trace/commons/types/variable_type.py index f2e43ea91..e4106f430 100644 --- a/seed/fastapi/trace/resources/commons/types/variable_type.py +++ b/seed/fastapi/trace/commons/types/variable_type.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore @@ -33,10 +33,10 @@ def string_type(self) -> VariableType: def char_type(self) -> VariableType: return VariableType(__root__=_VariableType.CharType(type="charType")) - def list_type(self, value: resources_commons_types_list_type_ListType) -> VariableType: + def list_type(self, value: commons_types_list_type_ListType) -> VariableType: return VariableType(__root__=_VariableType.ListType(**value.dict(exclude_unset=True), type="listType")) - def map_type(self, value: resources_commons_types_map_type_MapType) -> VariableType: + def map_type(self, value: commons_types_map_type_MapType) -> VariableType: return VariableType(__root__=_VariableType.MapType(**value.dict(exclude_unset=True), type="mapType")) def binary_tree_type(self) -> VariableType: @@ -75,8 +75,8 @@ def visit( boolean_type: typing.Callable[[], T_Result], string_type: typing.Callable[[], T_Result], char_type: typing.Callable[[], T_Result], - list_type: typing.Callable[[resources_commons_types_list_type_ListType], T_Result], - map_type: typing.Callable[[resources_commons_types_map_type_MapType], T_Result], + list_type: typing.Callable[[commons_types_list_type_ListType], T_Result], + map_type: typing.Callable[[commons_types_map_type_MapType], T_Result], binary_tree_type: typing.Callable[[], T_Result], singly_linked_list_type: typing.Callable[[], T_Result], doubly_linked_list_type: typing.Callable[[], T_Result], @@ -93,12 +93,10 @@ def visit( return char_type() if self.__root__.type == "listType": return list_type( - resources_commons_types_list_type_ListType(**self.__root__.dict(exclude_unset=True, exclude={"type"})) + commons_types_list_type_ListType(**self.__root__.dict(exclude_unset=True, exclude={"type"})) ) if self.__root__.type == "mapType": - return map_type( - resources_commons_types_map_type_MapType(**self.__root__.dict(exclude_unset=True, exclude={"type"})) - ) + return map_type(commons_types_map_type_MapType(**self.__root__.dict(exclude_unset=True, exclude={"type"}))) if self.__root__.type == "binaryTreeType": return binary_tree_type() if self.__root__.type == "singlyLinkedListType": @@ -135,8 +133,8 @@ class Config: json_encoders = {dt.datetime: serialize_datetime} -from .list_type import ListType as resources_commons_types_list_type_ListType # noqa: E402 -from .map_type import MapType as resources_commons_types_map_type_MapType # noqa: E402 +from .list_type import ListType as commons_types_list_type_ListType # noqa: E402 +from .map_type import MapType as commons_types_map_type_MapType # noqa: E402 class _VariableType: @@ -155,13 +153,13 @@ class StringType(pydantic.BaseModel): class CharType(pydantic.BaseModel): type: typing_extensions.Literal["charType"] - class ListType(resources_commons_types_list_type_ListType): + class ListType(commons_types_list_type_ListType): type: typing_extensions.Literal["listType"] class Config: allow_population_by_field_name = True - class MapType(resources_commons_types_map_type_MapType): + class MapType(commons_types_map_type_MapType): type: typing_extensions.Literal["mapType"] class Config: @@ -178,13 +176,9 @@ class DoublyLinkedListType(pydantic.BaseModel): _VariableType.ListType.update_forward_refs( - ListType=resources_commons_types_list_type_ListType, - MapType=resources_commons_types_map_type_MapType, - VariableType=VariableType, + ListType=commons_types_list_type_ListType, MapType=commons_types_map_type_MapType, VariableType=VariableType ) _VariableType.MapType.update_forward_refs( - ListType=resources_commons_types_list_type_ListType, - MapType=resources_commons_types_map_type_MapType, - VariableType=VariableType, + ListType=commons_types_list_type_ListType, MapType=commons_types_map_type_MapType, VariableType=VariableType ) VariableType.update_forward_refs() diff --git a/seed/fastapi/trace/resources/commons/types/variable_value.py b/seed/fastapi/trace/commons/types/variable_value.py similarity index 77% rename from seed/fastapi/trace/resources/commons/types/variable_value.py rename to seed/fastapi/trace/commons/types/variable_value.py index 78ea06d8f..9f2978f1f 100644 --- a/seed/fastapi/trace/resources/commons/types/variable_value.py +++ b/seed/fastapi/trace/commons/types/variable_value.py @@ -7,13 +7,13 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime -from .binary_tree_value import BinaryTreeValue as resources_commons_types_binary_tree_value_BinaryTreeValue +from ...core.datetime_utils import serialize_datetime +from .binary_tree_value import BinaryTreeValue as commons_types_binary_tree_value_BinaryTreeValue from .doubly_linked_list_value import ( - DoublyLinkedListValue as resources_commons_types_doubly_linked_list_value_DoublyLinkedListValue, + DoublyLinkedListValue as commons_types_doubly_linked_list_value_DoublyLinkedListValue, ) from .singly_linked_list_value import ( - SinglyLinkedListValue as resources_commons_types_singly_linked_list_value_SinglyLinkedListValue, + SinglyLinkedListValue as commons_types_singly_linked_list_value_SinglyLinkedListValue, ) try: @@ -40,19 +40,19 @@ def string_value(self, value: str) -> VariableValue: def char_value(self, value: str) -> VariableValue: return VariableValue(__root__=_VariableValue.CharValue(type="charValue", value=value)) - def map_value(self, value: resources_commons_types_map_value_MapValue) -> VariableValue: + def map_value(self, value: commons_types_map_value_MapValue) -> VariableValue: return VariableValue(__root__=_VariableValue.MapValue(**value.dict(exclude_unset=True), type="mapValue")) def list_value(self, value: typing.List[VariableValue]) -> VariableValue: return VariableValue(__root__=_VariableValue.ListValue(type="listValue", value=value)) - def binary_tree_value(self, value: resources_commons_types_binary_tree_value_BinaryTreeValue) -> VariableValue: + def binary_tree_value(self, value: commons_types_binary_tree_value_BinaryTreeValue) -> VariableValue: return VariableValue( __root__=_VariableValue.BinaryTreeValue(**value.dict(exclude_unset=True), type="binaryTreeValue") ) def singly_linked_list_value( - self, value: resources_commons_types_singly_linked_list_value_SinglyLinkedListValue + self, value: commons_types_singly_linked_list_value_SinglyLinkedListValue ) -> VariableValue: return VariableValue( __root__=_VariableValue.SinglyLinkedListValue( @@ -61,7 +61,7 @@ def singly_linked_list_value( ) def doubly_linked_list_value( - self, value: resources_commons_types_doubly_linked_list_value_DoublyLinkedListValue + self, value: commons_types_doubly_linked_list_value_DoublyLinkedListValue ) -> VariableValue: return VariableValue( __root__=_VariableValue.DoublyLinkedListValue( @@ -100,14 +100,14 @@ def visit( double_value: typing.Callable[[float], T_Result], string_value: typing.Callable[[str], T_Result], char_value: typing.Callable[[str], T_Result], - map_value: typing.Callable[[resources_commons_types_map_value_MapValue], T_Result], + map_value: typing.Callable[[commons_types_map_value_MapValue], T_Result], list_value: typing.Callable[[typing.List[VariableValue]], T_Result], - binary_tree_value: typing.Callable[[resources_commons_types_binary_tree_value_BinaryTreeValue], T_Result], + binary_tree_value: typing.Callable[[commons_types_binary_tree_value_BinaryTreeValue], T_Result], singly_linked_list_value: typing.Callable[ - [resources_commons_types_singly_linked_list_value_SinglyLinkedListValue], T_Result + [commons_types_singly_linked_list_value_SinglyLinkedListValue], T_Result ], doubly_linked_list_value: typing.Callable[ - [resources_commons_types_doubly_linked_list_value_DoublyLinkedListValue], T_Result + [commons_types_doubly_linked_list_value_DoublyLinkedListValue], T_Result ], null_value: typing.Callable[[], T_Result], ) -> T_Result: @@ -123,25 +123,25 @@ def visit( return char_value(self.__root__.value) if self.__root__.type == "mapValue": return map_value( - resources_commons_types_map_value_MapValue(**self.__root__.dict(exclude_unset=True, exclude={"type"})) + commons_types_map_value_MapValue(**self.__root__.dict(exclude_unset=True, exclude={"type"})) ) if self.__root__.type == "listValue": return list_value(self.__root__.value) if self.__root__.type == "binaryTreeValue": return binary_tree_value( - resources_commons_types_binary_tree_value_BinaryTreeValue( + commons_types_binary_tree_value_BinaryTreeValue( **self.__root__.dict(exclude_unset=True, exclude={"type"}) ) ) if self.__root__.type == "singlyLinkedListValue": return singly_linked_list_value( - resources_commons_types_singly_linked_list_value_SinglyLinkedListValue( + commons_types_singly_linked_list_value_SinglyLinkedListValue( **self.__root__.dict(exclude_unset=True, exclude={"type"}) ) ) if self.__root__.type == "doublyLinkedListValue": return doubly_linked_list_value( - resources_commons_types_doubly_linked_list_value_DoublyLinkedListValue( + commons_types_doubly_linked_list_value_DoublyLinkedListValue( **self.__root__.dict(exclude_unset=True, exclude={"type"}) ) ) @@ -179,7 +179,7 @@ class Config: from .key_value_pair import KeyValuePair # noqa: E402 -from .map_value import MapValue as resources_commons_types_map_value_MapValue # noqa: E402 +from .map_value import MapValue as commons_types_map_value_MapValue # noqa: E402 class _VariableValue: @@ -203,7 +203,7 @@ class CharValue(pydantic.BaseModel): type: typing_extensions.Literal["charValue"] value: str - class MapValue(resources_commons_types_map_value_MapValue): + class MapValue(commons_types_map_value_MapValue): type: typing_extensions.Literal["mapValue"] class Config: @@ -213,19 +213,19 @@ class ListValue(pydantic.BaseModel): type: typing_extensions.Literal["listValue"] value: typing.List[VariableValue] - class BinaryTreeValue(resources_commons_types_binary_tree_value_BinaryTreeValue): + class BinaryTreeValue(commons_types_binary_tree_value_BinaryTreeValue): type: typing_extensions.Literal["binaryTreeValue"] class Config: allow_population_by_field_name = True - class SinglyLinkedListValue(resources_commons_types_singly_linked_list_value_SinglyLinkedListValue): + class SinglyLinkedListValue(commons_types_singly_linked_list_value_SinglyLinkedListValue): type: typing_extensions.Literal["singlyLinkedListValue"] class Config: allow_population_by_field_name = True - class DoublyLinkedListValue(resources_commons_types_doubly_linked_list_value_DoublyLinkedListValue): + class DoublyLinkedListValue(commons_types_doubly_linked_list_value_DoublyLinkedListValue): type: typing_extensions.Literal["doublyLinkedListValue"] class Config: @@ -236,9 +236,9 @@ class NullValue(pydantic.BaseModel): _VariableValue.MapValue.update_forward_refs( - KeyValuePair=KeyValuePair, MapValue=resources_commons_types_map_value_MapValue, VariableValue=VariableValue + KeyValuePair=KeyValuePair, MapValue=commons_types_map_value_MapValue, VariableValue=VariableValue ) _VariableValue.ListValue.update_forward_refs( - KeyValuePair=KeyValuePair, MapValue=resources_commons_types_map_value_MapValue, VariableValue=VariableValue + KeyValuePair=KeyValuePair, MapValue=commons_types_map_value_MapValue, VariableValue=VariableValue ) VariableValue.update_forward_refs() diff --git a/seed/fastapi/trace/resources/homepage/__init__.py b/seed/fastapi/trace/homepage/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/homepage/__init__.py rename to seed/fastapi/trace/homepage/__init__.py diff --git a/seed/fastapi/trace/resources/homepage/service/__init__.py b/seed/fastapi/trace/homepage/service/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/homepage/service/__init__.py rename to seed/fastapi/trace/homepage/service/__init__.py diff --git a/seed/fastapi/trace/resources/homepage/service/service.py b/seed/fastapi/trace/homepage/service/service.py similarity index 96% rename from seed/fastapi/trace/resources/homepage/service/service.py rename to seed/fastapi/trace/homepage/service/service.py index 13b4418bf..eafc9de31 100644 --- a/seed/fastapi/trace/resources/homepage/service/service.py +++ b/seed/fastapi/trace/homepage/service/service.py @@ -9,10 +9,10 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args from ...commons.types.problem_id import ProblemId +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args class AbstractHomepageService(AbstractFernService): diff --git a/seed/fastapi/trace/resources/lang_server/__init__.py b/seed/fastapi/trace/lang_server/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/lang_server/__init__.py rename to seed/fastapi/trace/lang_server/__init__.py diff --git a/seed/fastapi/trace/resources/lang_server/types/__init__.py b/seed/fastapi/trace/lang_server/types/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/lang_server/types/__init__.py rename to seed/fastapi/trace/lang_server/types/__init__.py diff --git a/seed/fastapi/trace/resources/lang_server/types/lang_server_request.py b/seed/fastapi/trace/lang_server/types/lang_server_request.py similarity index 93% rename from seed/fastapi/trace/resources/lang_server/types/lang_server_request.py rename to seed/fastapi/trace/lang_server/types/lang_server_request.py index 0dbbdfdfb..07ab4c2b9 100644 --- a/seed/fastapi/trace/resources/lang_server/types/lang_server_request.py +++ b/seed/fastapi/trace/lang_server/types/lang_server_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/lang_server/types/lang_server_response.py b/seed/fastapi/trace/lang_server/types/lang_server_response.py similarity index 93% rename from seed/fastapi/trace/resources/lang_server/types/lang_server_response.py rename to seed/fastapi/trace/lang_server/types/lang_server_response.py index 6268a918d..79d8e19ea 100644 --- a/seed/fastapi/trace/resources/lang_server/types/lang_server_response.py +++ b/seed/fastapi/trace/lang_server/types/lang_server_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/migration/__init__.py b/seed/fastapi/trace/migration/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/migration/__init__.py rename to seed/fastapi/trace/migration/__init__.py diff --git a/seed/fastapi/trace/resources/migration/service/__init__.py b/seed/fastapi/trace/migration/service/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/migration/service/__init__.py rename to seed/fastapi/trace/migration/service/__init__.py diff --git a/seed/fastapi/trace/resources/migration/service/service.py b/seed/fastapi/trace/migration/service/service.py similarity index 94% rename from seed/fastapi/trace/resources/migration/service/service.py rename to seed/fastapi/trace/migration/service/service.py index 06869f404..a1fff1f04 100644 --- a/seed/fastapi/trace/resources/migration/service/service.py +++ b/seed/fastapi/trace/migration/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ..types.migration import Migration diff --git a/seed/fastapi/trace/resources/migration/types/__init__.py b/seed/fastapi/trace/migration/types/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/migration/types/__init__.py rename to seed/fastapi/trace/migration/types/__init__.py diff --git a/seed/fastapi/trace/resources/migration/types/migration.py b/seed/fastapi/trace/migration/types/migration.py similarity index 94% rename from seed/fastapi/trace/resources/migration/types/migration.py rename to seed/fastapi/trace/migration/types/migration.py index 97942e518..3e443e7e1 100644 --- a/seed/fastapi/trace/resources/migration/types/migration.py +++ b/seed/fastapi/trace/migration/types/migration.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .migration_status import MigrationStatus try: diff --git a/seed/fastapi/trace/resources/migration/types/migration_status.py b/seed/fastapi/trace/migration/types/migration_status.py similarity index 100% rename from seed/fastapi/trace/resources/migration/types/migration_status.py rename to seed/fastapi/trace/migration/types/migration_status.py diff --git a/seed/fastapi/trace/resources/playlist/__init__.py b/seed/fastapi/trace/playlist/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/playlist/__init__.py rename to seed/fastapi/trace/playlist/__init__.py diff --git a/seed/fastapi/trace/resources/playlist/errors/__init__.py b/seed/fastapi/trace/playlist/errors/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/playlist/errors/__init__.py rename to seed/fastapi/trace/playlist/errors/__init__.py diff --git a/seed/fastapi/trace/resources/playlist/errors/playlist_id_not_found_error.py b/seed/fastapi/trace/playlist/errors/playlist_id_not_found_error.py similarity index 83% rename from seed/fastapi/trace/resources/playlist/errors/playlist_id_not_found_error.py rename to seed/fastapi/trace/playlist/errors/playlist_id_not_found_error.py index d4d9c5453..ccbfa33ee 100644 --- a/seed/fastapi/trace/resources/playlist/errors/playlist_id_not_found_error.py +++ b/seed/fastapi/trace/playlist/errors/playlist_id_not_found_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...core.exceptions.fern_http_exception import FernHTTPException from ..types.playlist_id_not_found_error_body import PlaylistIdNotFoundErrorBody diff --git a/seed/fastapi/trace/resources/playlist/errors/unauthorized_error.py b/seed/fastapi/trace/playlist/errors/unauthorized_error.py similarity index 75% rename from seed/fastapi/trace/resources/playlist/errors/unauthorized_error.py rename to seed/fastapi/trace/playlist/errors/unauthorized_error.py index 77b7b3d47..967764d92 100644 --- a/seed/fastapi/trace/resources/playlist/errors/unauthorized_error.py +++ b/seed/fastapi/trace/playlist/errors/unauthorized_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.exceptions.fern_http_exception import FernHTTPException +from ...core.exceptions.fern_http_exception import FernHTTPException class UnauthorizedError(FernHTTPException): diff --git a/seed/fastapi/trace/resources/playlist/service/__init__.py b/seed/fastapi/trace/playlist/service/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/playlist/service/__init__.py rename to seed/fastapi/trace/playlist/service/__init__.py diff --git a/seed/fastapi/trace/resources/playlist/service/service.py b/seed/fastapi/trace/playlist/service/service.py similarity index 98% rename from seed/fastapi/trace/resources/playlist/service/service.py rename to seed/fastapi/trace/playlist/service/service.py index 0f64aa153..21e359026 100644 --- a/seed/fastapi/trace/resources/playlist/service/service.py +++ b/seed/fastapi/trace/playlist/service/service.py @@ -10,10 +10,10 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args -from ....security import ApiAuth, FernAuth +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args +from ...security import ApiAuth, FernAuth from ..errors.playlist_id_not_found_error import PlaylistIdNotFoundError from ..errors.unauthorized_error import UnauthorizedError from ..types.playlist import Playlist @@ -129,9 +129,8 @@ def __init_get_playlists(cls, router: fastapi.APIRouter) -> None: elif parameter_name == "other_field": new_parameters.append(parameter.replace(default=fastapi.Query(default=..., alias="otherField", description="i'm another fieldi'm another field"))) elif parameter_name == "multi_line_docs": - new_parameters.append(parameter.replace(default=fastapi.Query(default=..., alias="multiLineDocs", description="I'm a multiline\ndescription\nI'm a multiline - description - "))) + new_parameters.append(parameter.replace(default=fastapi.Query(default=..., alias="multiLineDocs", description="I'm a multiline\ndescriptionI'm a multiline + description"))) elif parameter_name == "optional_multiple_field": new_parameters.append(parameter.replace(default=fastapi.Query(default=None, alias="optionalMultipleField"))) elif parameter_name == "multiple_field": diff --git a/seed/fastapi/trace/resources/playlist/types/__init__.py b/seed/fastapi/trace/playlist/types/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/playlist/types/__init__.py rename to seed/fastapi/trace/playlist/types/__init__.py diff --git a/seed/fastapi/trace/resources/playlist/types/playlist.py b/seed/fastapi/trace/playlist/types/playlist.py similarity index 95% rename from seed/fastapi/trace/resources/playlist/types/playlist.py rename to seed/fastapi/trace/playlist/types/playlist.py index 3d33b7893..71ae95064 100644 --- a/seed/fastapi/trace/resources/playlist/types/playlist.py +++ b/seed/fastapi/trace/playlist/types/playlist.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.user_id import UserId +from ...core.datetime_utils import serialize_datetime from .playlist_create_request import PlaylistCreateRequest from .playlist_id import PlaylistId diff --git a/seed/fastapi/trace/resources/playlist/types/playlist_create_request.py b/seed/fastapi/trace/playlist/types/playlist_create_request.py similarity index 94% rename from seed/fastapi/trace/resources/playlist/types/playlist_create_request.py rename to seed/fastapi/trace/playlist/types/playlist_create_request.py index 19497469c..0ee2a175e 100644 --- a/seed/fastapi/trace/resources/playlist/types/playlist_create_request.py +++ b/seed/fastapi/trace/playlist/types/playlist_create_request.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.problem_id import ProblemId +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/playlist/types/playlist_id.py b/seed/fastapi/trace/playlist/types/playlist_id.py similarity index 94% rename from seed/fastapi/trace/resources/playlist/types/playlist_id.py rename to seed/fastapi/trace/playlist/types/playlist_id.py index a3c1458d2..dbfb61c49 100644 --- a/seed/fastapi/trace/resources/playlist/types/playlist_id.py +++ b/seed/fastapi/trace/playlist/types/playlist_id.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/playlist/types/playlist_id_not_found_error_body.py b/seed/fastapi/trace/playlist/types/playlist_id_not_found_error_body.py similarity index 77% rename from seed/fastapi/trace/resources/playlist/types/playlist_id_not_found_error_body.py rename to seed/fastapi/trace/playlist/types/playlist_id_not_found_error_body.py index 0fbe0d49f..96e1fc80f 100644 --- a/seed/fastapi/trace/resources/playlist/types/playlist_id_not_found_error_body.py +++ b/seed/fastapi/trace/playlist/types/playlist_id_not_found_error_body.py @@ -7,8 +7,8 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime -from .playlist_id import PlaylistId as resources_playlist_types_playlist_id_PlaylistId +from ...core.datetime_utils import serialize_datetime +from .playlist_id import PlaylistId as playlist_types_playlist_id_PlaylistId try: import pydantic.v1 as pydantic # type: ignore @@ -19,7 +19,7 @@ class _Factory: - def playlist_id(self, value: resources_playlist_types_playlist_id_PlaylistId) -> PlaylistIdNotFoundErrorBody: + def playlist_id(self, value: playlist_types_playlist_id_PlaylistId) -> PlaylistIdNotFoundErrorBody: return PlaylistIdNotFoundErrorBody( __root__=_PlaylistIdNotFoundErrorBody.PlaylistId(type="playlistId", value=value) ) @@ -31,9 +31,7 @@ class PlaylistIdNotFoundErrorBody(pydantic.BaseModel): def get_as_union(self) -> typing.Union[_PlaylistIdNotFoundErrorBody.PlaylistId]: return self.__root__ - def visit( - self, playlist_id: typing.Callable[[resources_playlist_types_playlist_id_PlaylistId], T_Result] - ) -> T_Result: + def visit(self, playlist_id: typing.Callable[[playlist_types_playlist_id_PlaylistId], T_Result]) -> T_Result: if self.__root__.type == "playlistId": return playlist_id(self.__root__.value) @@ -55,7 +53,7 @@ class Config: class _PlaylistIdNotFoundErrorBody: class PlaylistId(pydantic.BaseModel): type: typing_extensions.Literal["playlistId"] - value: resources_playlist_types_playlist_id_PlaylistId + value: playlist_types_playlist_id_PlaylistId PlaylistIdNotFoundErrorBody.update_forward_refs() diff --git a/seed/fastapi/trace/resources/playlist/types/reserved_keyword_enum.py b/seed/fastapi/trace/playlist/types/reserved_keyword_enum.py similarity index 100% rename from seed/fastapi/trace/resources/playlist/types/reserved_keyword_enum.py rename to seed/fastapi/trace/playlist/types/reserved_keyword_enum.py diff --git a/seed/fastapi/trace/resources/playlist/types/update_playlist_request.py b/seed/fastapi/trace/playlist/types/update_playlist_request.py similarity index 94% rename from seed/fastapi/trace/resources/playlist/types/update_playlist_request.py rename to seed/fastapi/trace/playlist/types/update_playlist_request.py index a6a5719d3..ac686611b 100644 --- a/seed/fastapi/trace/resources/playlist/types/update_playlist_request.py +++ b/seed/fastapi/trace/playlist/types/update_playlist_request.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.problem_id import ProblemId +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/problem/__init__.py b/seed/fastapi/trace/problem/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/problem/__init__.py rename to seed/fastapi/trace/problem/__init__.py diff --git a/seed/fastapi/trace/resources/problem/service/__init__.py b/seed/fastapi/trace/problem/service/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/problem/service/__init__.py rename to seed/fastapi/trace/problem/service/__init__.py diff --git a/seed/fastapi/trace/resources/problem/service/get_default_starter_files_request.py b/seed/fastapi/trace/problem/service/get_default_starter_files_request.py similarity index 96% rename from seed/fastapi/trace/resources/problem/service/get_default_starter_files_request.py rename to seed/fastapi/trace/problem/service/get_default_starter_files_request.py index 1f719b215..f44518de0 100644 --- a/seed/fastapi/trace/resources/problem/service/get_default_starter_files_request.py +++ b/seed/fastapi/trace/problem/service/get_default_starter_files_request.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.variable_type import VariableType +from ...core.datetime_utils import serialize_datetime from ..types.variable_type_and_name import VariableTypeAndName try: diff --git a/seed/fastapi/trace/resources/problem/service/service.py b/seed/fastapi/trace/problem/service/service.py similarity index 98% rename from seed/fastapi/trace/resources/problem/service/service.py rename to seed/fastapi/trace/problem/service/service.py index 14f5597eb..3554f8686 100644 --- a/seed/fastapi/trace/resources/problem/service/service.py +++ b/seed/fastapi/trace/problem/service/service.py @@ -9,9 +9,9 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ..types.create_problem_request import CreateProblemRequest from ..types.create_problem_response import CreateProblemResponse from ..types.get_default_starter_files_response import GetDefaultStarterFilesResponse diff --git a/seed/fastapi/trace/resources/problem/types/__init__.py b/seed/fastapi/trace/problem/types/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/problem/types/__init__.py rename to seed/fastapi/trace/problem/types/__init__.py diff --git a/seed/fastapi/trace/resources/problem/types/create_problem_error.py b/seed/fastapi/trace/problem/types/create_problem_error.py similarity index 97% rename from seed/fastapi/trace/resources/problem/types/create_problem_error.py rename to seed/fastapi/trace/problem/types/create_problem_error.py index 38d9f8836..527017b80 100644 --- a/seed/fastapi/trace/resources/problem/types/create_problem_error.py +++ b/seed/fastapi/trace/problem/types/create_problem_error.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .generic_create_problem_error import GenericCreateProblemError try: diff --git a/seed/fastapi/trace/resources/problem/types/create_problem_request.py b/seed/fastapi/trace/problem/types/create_problem_request.py similarity index 96% rename from seed/fastapi/trace/resources/problem/types/create_problem_request.py rename to seed/fastapi/trace/problem/types/create_problem_request.py index b7d1fdb00..4a37974ef 100644 --- a/seed/fastapi/trace/resources/problem/types/create_problem_request.py +++ b/seed/fastapi/trace/problem/types/create_problem_request.py @@ -3,10 +3,10 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.language import Language from ...commons.types.test_case_with_expected_result import TestCaseWithExpectedResult from ...commons.types.variable_type import VariableType +from ...core.datetime_utils import serialize_datetime from .problem_description import ProblemDescription from .problem_files import ProblemFiles from .variable_type_and_name import VariableTypeAndName diff --git a/seed/fastapi/trace/resources/problem/types/create_problem_response.py b/seed/fastapi/trace/problem/types/create_problem_response.py similarity index 97% rename from seed/fastapi/trace/resources/problem/types/create_problem_response.py rename to seed/fastapi/trace/problem/types/create_problem_response.py index a36a7b120..ff56ea5f5 100644 --- a/seed/fastapi/trace/resources/problem/types/create_problem_response.py +++ b/seed/fastapi/trace/problem/types/create_problem_response.py @@ -7,8 +7,8 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime from ...commons.types.problem_id import ProblemId +from ...core.datetime_utils import serialize_datetime from .create_problem_error import CreateProblemError try: diff --git a/seed/fastapi/trace/resources/problem/types/generic_create_problem_error.py b/seed/fastapi/trace/problem/types/generic_create_problem_error.py similarity index 93% rename from seed/fastapi/trace/resources/problem/types/generic_create_problem_error.py rename to seed/fastapi/trace/problem/types/generic_create_problem_error.py index df3e6d5f3..a5273a7a2 100644 --- a/seed/fastapi/trace/resources/problem/types/generic_create_problem_error.py +++ b/seed/fastapi/trace/problem/types/generic_create_problem_error.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/problem/types/get_default_starter_files_response.py b/seed/fastapi/trace/problem/types/get_default_starter_files_response.py similarity index 94% rename from seed/fastapi/trace/resources/problem/types/get_default_starter_files_response.py rename to seed/fastapi/trace/problem/types/get_default_starter_files_response.py index e2d100547..ee46d0eda 100644 --- a/seed/fastapi/trace/resources/problem/types/get_default_starter_files_response.py +++ b/seed/fastapi/trace/problem/types/get_default_starter_files_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.language import Language +from ...core.datetime_utils import serialize_datetime from .problem_files import ProblemFiles try: diff --git a/seed/fastapi/trace/resources/problem/types/problem_description.py b/seed/fastapi/trace/problem/types/problem_description.py similarity index 94% rename from seed/fastapi/trace/resources/problem/types/problem_description.py rename to seed/fastapi/trace/problem/types/problem_description.py index 32a5f2844..9055cbb89 100644 --- a/seed/fastapi/trace/resources/problem/types/problem_description.py +++ b/seed/fastapi/trace/problem/types/problem_description.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .problem_description_board import ProblemDescriptionBoard try: diff --git a/seed/fastapi/trace/resources/problem/types/problem_description_board.py b/seed/fastapi/trace/problem/types/problem_description_board.py similarity index 98% rename from seed/fastapi/trace/resources/problem/types/problem_description_board.py rename to seed/fastapi/trace/problem/types/problem_description_board.py index e29af19f6..4a1f49f1c 100644 --- a/seed/fastapi/trace/resources/problem/types/problem_description_board.py +++ b/seed/fastapi/trace/problem/types/problem_description_board.py @@ -7,8 +7,8 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime from ...commons.types.variable_value import VariableValue +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/problem/types/problem_files.py b/seed/fastapi/trace/problem/types/problem_files.py similarity index 94% rename from seed/fastapi/trace/resources/problem/types/problem_files.py rename to seed/fastapi/trace/problem/types/problem_files.py index 0fb0f8ee9..90810c2d4 100644 --- a/seed/fastapi/trace/resources/problem/types/problem_files.py +++ b/seed/fastapi/trace/problem/types/problem_files.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.file_info import FileInfo +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/problem/types/problem_info.py b/seed/fastapi/trace/problem/types/problem_info.py similarity index 97% rename from seed/fastapi/trace/resources/problem/types/problem_info.py rename to seed/fastapi/trace/problem/types/problem_info.py index 78cd21281..98b7b3a10 100644 --- a/seed/fastapi/trace/resources/problem/types/problem_info.py +++ b/seed/fastapi/trace/problem/types/problem_info.py @@ -3,11 +3,11 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.language import Language from ...commons.types.problem_id import ProblemId from ...commons.types.test_case_with_expected_result import TestCaseWithExpectedResult from ...commons.types.variable_type import VariableType +from ...core.datetime_utils import serialize_datetime from .problem_description import ProblemDescription from .problem_files import ProblemFiles from .variable_type_and_name import VariableTypeAndName diff --git a/seed/fastapi/trace/resources/problem/types/update_problem_response.py b/seed/fastapi/trace/problem/types/update_problem_response.py similarity index 94% rename from seed/fastapi/trace/resources/problem/types/update_problem_response.py rename to seed/fastapi/trace/problem/types/update_problem_response.py index 2325ac88c..3d427fca2 100644 --- a/seed/fastapi/trace/resources/problem/types/update_problem_response.py +++ b/seed/fastapi/trace/problem/types/update_problem_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/problem/types/variable_type_and_name.py b/seed/fastapi/trace/problem/types/variable_type_and_name.py similarity index 94% rename from seed/fastapi/trace/resources/problem/types/variable_type_and_name.py rename to seed/fastapi/trace/problem/types/variable_type_and_name.py index afcbd15b6..b97bb94d4 100644 --- a/seed/fastapi/trace/resources/problem/types/variable_type_and_name.py +++ b/seed/fastapi/trace/problem/types/variable_type_and_name.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.variable_type import VariableType +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/register.py b/seed/fastapi/trace/register.py index 2c4bc91fc..636a1409f 100644 --- a/seed/fastapi/trace/register.py +++ b/seed/fastapi/trace/register.py @@ -10,19 +10,19 @@ import starlette from fastapi import params +from .admin.service.service import AbstractAdminService from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.admin.service.service import AbstractAdminService -from .resources.homepage.service.service import AbstractHomepageService -from .resources.migration.service.service import AbstractMigrationService -from .resources.playlist.service.service import AbstractPlaylistService -from .resources.problem.service.service import AbstractProblemService -from .resources.submission.service.service import AbstractSubmissionService -from .resources.sysprop.service.service import AbstractSyspropService -from .resources.v_2.resources.problem.service.service import AbstractV2ProblemService -from .resources.v_2.resources.v_3.resources.problem.service.service import AbstractV2V3ProblemService -from .resources.v_2.service.service import AbstractV2Service +from .homepage.service.service import AbstractHomepageService +from .migration.service.service import AbstractMigrationService +from .playlist.service.service import AbstractPlaylistService +from .problem.service.service import AbstractProblemService +from .submission.service.service import AbstractSubmissionService +from .sysprop.service.service import AbstractSyspropService +from .v_2.problem.service.service import AbstractV2ProblemService +from .v_2.service.service import AbstractV2Service +from .v_2.v_3.problem.service.service import AbstractV2V3ProblemService def register( diff --git a/seed/fastapi/trace/resources/__init__.py b/seed/fastapi/trace/resources/__init__.py deleted file mode 100644 index cccbe80f2..000000000 --- a/seed/fastapi/trace/resources/__init__.py +++ /dev/null @@ -1,284 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import admin, commons, lang_server, migration, playlist, problem, submission, v_2 -from .admin import StoreTracedTestCaseRequest, StoreTracedWorkspaceRequest, Test -from .commons import ( - BinaryTreeNodeAndTreeValue, - BinaryTreeNodeValue, - BinaryTreeValue, - DebugKeyValuePairs, - DebugMapValue, - DebugVariableValue, - DoublyLinkedListNodeAndListValue, - DoublyLinkedListNodeValue, - DoublyLinkedListValue, - FileInfo, - GenericValue, - KeyValuePair, - Language, - ListType, - MapType, - MapValue, - NodeId, - ProblemId, - SinglyLinkedListNodeAndListValue, - SinglyLinkedListNodeValue, - SinglyLinkedListValue, - TestCase, - TestCaseWithExpectedResult, - UserId, - VariableType, - VariableValue, -) -from .lang_server import LangServerRequest, LangServerResponse -from .migration import Migration, MigrationStatus -from .playlist import ( - Playlist, - PlaylistCreateRequest, - PlaylistId, - PlaylistIdNotFoundError, - PlaylistIdNotFoundErrorBody, - ReservedKeywordEnum, - UnauthorizedError, - UpdatePlaylistRequest, -) -from .problem import ( - CreateProblemError, - CreateProblemRequest, - CreateProblemResponse, - GenericCreateProblemError, - GetDefaultStarterFilesRequest, - GetDefaultStarterFilesResponse, - ProblemDescription, - ProblemDescriptionBoard, - ProblemFiles, - ProblemInfo, - UpdateProblemResponse, - VariableTypeAndName, -) -from .submission import ( - ActualResult, - BuildingExecutorResponse, - CodeExecutionUpdate, - CompileError, - CustomTestCasesUnsupported, - ErrorInfo, - ErroredResponse, - ExceptionInfo, - ExceptionV2, - ExecutionSessionResponse, - ExecutionSessionState, - ExecutionSessionStatus, - ExistingSubmissionExecuting, - ExpressionLocation, - FinishedResponse, - GetExecutionSessionStateResponse, - GetSubmissionStateResponse, - GetTraceResponsesPageRequest, - GradedResponse, - GradedResponseV2, - GradedTestCaseUpdate, - InitializeProblemRequest, - InternalError, - InvalidRequestCause, - InvalidRequestResponse, - LightweightStackframeInformation, - RecordedResponseNotification, - RecordedTestCaseUpdate, - RecordingResponseNotification, - RunningResponse, - RunningSubmissionState, - RuntimeError, - Scope, - ShareId, - StackFrame, - StackInformation, - StderrResponse, - StdoutResponse, - StopRequest, - StoppedResponse, - SubmissionFileInfo, - SubmissionId, - SubmissionIdNotFound, - SubmissionRequest, - SubmissionResponse, - SubmissionStatusForTestCase, - SubmissionStatusV2, - SubmissionTypeEnum, - SubmissionTypeState, - SubmitRequestV2, - TerminatedResponse, - TestCaseGrade, - TestCaseHiddenGrade, - TestCaseNonHiddenGrade, - TestCaseResult, - TestCaseResultWithStdout, - TestSubmissionState, - TestSubmissionStatus, - TestSubmissionStatusV2, - TestSubmissionUpdate, - TestSubmissionUpdateInfo, - TraceResponse, - TraceResponseV2, - TraceResponsesPage, - TraceResponsesPageV2, - TracedFile, - TracedTestCase, - UnexpectedLanguageError, - WorkspaceFiles, - WorkspaceRanResponse, - WorkspaceRunDetails, - WorkspaceStarterFilesResponse, - WorkspaceStarterFilesResponseV2, - WorkspaceSubmissionState, - WorkspaceSubmissionStatus, - WorkspaceSubmissionStatusV2, - WorkspaceSubmissionUpdate, - WorkspaceSubmissionUpdateInfo, - WorkspaceSubmitRequest, - WorkspaceTracedUpdate, -) - -__all__ = [ - "ActualResult", - "BinaryTreeNodeAndTreeValue", - "BinaryTreeNodeValue", - "BinaryTreeValue", - "BuildingExecutorResponse", - "CodeExecutionUpdate", - "CompileError", - "CreateProblemError", - "CreateProblemRequest", - "CreateProblemResponse", - "CustomTestCasesUnsupported", - "DebugKeyValuePairs", - "DebugMapValue", - "DebugVariableValue", - "DoublyLinkedListNodeAndListValue", - "DoublyLinkedListNodeValue", - "DoublyLinkedListValue", - "ErrorInfo", - "ErroredResponse", - "ExceptionInfo", - "ExceptionV2", - "ExecutionSessionResponse", - "ExecutionSessionState", - "ExecutionSessionStatus", - "ExistingSubmissionExecuting", - "ExpressionLocation", - "FileInfo", - "FinishedResponse", - "GenericCreateProblemError", - "GenericValue", - "GetDefaultStarterFilesRequest", - "GetDefaultStarterFilesResponse", - "GetExecutionSessionStateResponse", - "GetSubmissionStateResponse", - "GetTraceResponsesPageRequest", - "GradedResponse", - "GradedResponseV2", - "GradedTestCaseUpdate", - "InitializeProblemRequest", - "InternalError", - "InvalidRequestCause", - "InvalidRequestResponse", - "KeyValuePair", - "LangServerRequest", - "LangServerResponse", - "Language", - "LightweightStackframeInformation", - "ListType", - "MapType", - "MapValue", - "Migration", - "MigrationStatus", - "NodeId", - "Playlist", - "PlaylistCreateRequest", - "PlaylistId", - "PlaylistIdNotFoundError", - "PlaylistIdNotFoundErrorBody", - "ProblemDescription", - "ProblemDescriptionBoard", - "ProblemFiles", - "ProblemId", - "ProblemInfo", - "RecordedResponseNotification", - "RecordedTestCaseUpdate", - "RecordingResponseNotification", - "ReservedKeywordEnum", - "RunningResponse", - "RunningSubmissionState", - "RuntimeError", - "Scope", - "ShareId", - "SinglyLinkedListNodeAndListValue", - "SinglyLinkedListNodeValue", - "SinglyLinkedListValue", - "StackFrame", - "StackInformation", - "StderrResponse", - "StdoutResponse", - "StopRequest", - "StoppedResponse", - "StoreTracedTestCaseRequest", - "StoreTracedWorkspaceRequest", - "SubmissionFileInfo", - "SubmissionId", - "SubmissionIdNotFound", - "SubmissionRequest", - "SubmissionResponse", - "SubmissionStatusForTestCase", - "SubmissionStatusV2", - "SubmissionTypeEnum", - "SubmissionTypeState", - "SubmitRequestV2", - "TerminatedResponse", - "Test", - "TestCase", - "TestCaseGrade", - "TestCaseHiddenGrade", - "TestCaseNonHiddenGrade", - "TestCaseResult", - "TestCaseResultWithStdout", - "TestCaseWithExpectedResult", - "TestSubmissionState", - "TestSubmissionStatus", - "TestSubmissionStatusV2", - "TestSubmissionUpdate", - "TestSubmissionUpdateInfo", - "TraceResponse", - "TraceResponseV2", - "TraceResponsesPage", - "TraceResponsesPageV2", - "TracedFile", - "TracedTestCase", - "UnauthorizedError", - "UnexpectedLanguageError", - "UpdatePlaylistRequest", - "UpdateProblemResponse", - "UserId", - "VariableType", - "VariableTypeAndName", - "VariableValue", - "WorkspaceFiles", - "WorkspaceRanResponse", - "WorkspaceRunDetails", - "WorkspaceStarterFilesResponse", - "WorkspaceStarterFilesResponseV2", - "WorkspaceSubmissionState", - "WorkspaceSubmissionStatus", - "WorkspaceSubmissionStatusV2", - "WorkspaceSubmissionUpdate", - "WorkspaceSubmissionUpdateInfo", - "WorkspaceSubmitRequest", - "WorkspaceTracedUpdate", - "admin", - "commons", - "lang_server", - "migration", - "playlist", - "problem", - "submission", - "v_2", -] diff --git a/seed/fastapi/trace/resources/v_2/__init__.py b/seed/fastapi/trace/resources/v_2/__init__.py deleted file mode 100644 index bfb753793..000000000 --- a/seed/fastapi/trace/resources/v_2/__init__.py +++ /dev/null @@ -1,93 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import ( - AssertCorrectnessCheck, - BasicCustomFiles, - BasicTestCaseTemplate, - CreateProblemRequestV2, - CustomFiles, - DeepEqualityCorrectnessCheck, - DefaultProvidedFile, - FileInfoV2, - Files, - FunctionImplementation, - FunctionImplementationForMultipleLanguages, - FunctionSignature, - GeneratedFiles, - GetBasicSolutionFileRequest, - GetBasicSolutionFileResponse, - GetFunctionSignatureRequest, - GetFunctionSignatureResponse, - GetGeneratedTestCaseFileRequest, - GetGeneratedTestCaseTemplateFileRequest, - LightweightProblemInfoV2, - NonVoidFunctionDefinition, - NonVoidFunctionSignature, - Parameter, - ParameterId, - ProblemInfoV2, - TestCaseExpects, - TestCaseFunction, - TestCaseId, - TestCaseImplementation, - TestCaseImplementationDescription, - TestCaseImplementationDescriptionBoard, - TestCaseImplementationReference, - TestCaseMetadata, - TestCaseTemplate, - TestCaseTemplateId, - TestCaseV2, - TestCaseWithActualResultImplementation, - VoidFunctionDefinition, - VoidFunctionDefinitionThatTakesActualResult, - VoidFunctionSignature, - VoidFunctionSignatureThatTakesActualResult, - problem, - v_3, -) - -__all__ = [ - "AssertCorrectnessCheck", - "BasicCustomFiles", - "BasicTestCaseTemplate", - "CreateProblemRequestV2", - "CustomFiles", - "DeepEqualityCorrectnessCheck", - "DefaultProvidedFile", - "FileInfoV2", - "Files", - "FunctionImplementation", - "FunctionImplementationForMultipleLanguages", - "FunctionSignature", - "GeneratedFiles", - "GetBasicSolutionFileRequest", - "GetBasicSolutionFileResponse", - "GetFunctionSignatureRequest", - "GetFunctionSignatureResponse", - "GetGeneratedTestCaseFileRequest", - "GetGeneratedTestCaseTemplateFileRequest", - "LightweightProblemInfoV2", - "NonVoidFunctionDefinition", - "NonVoidFunctionSignature", - "Parameter", - "ParameterId", - "ProblemInfoV2", - "TestCaseExpects", - "TestCaseFunction", - "TestCaseId", - "TestCaseImplementation", - "TestCaseImplementationDescription", - "TestCaseImplementationDescriptionBoard", - "TestCaseImplementationReference", - "TestCaseMetadata", - "TestCaseTemplate", - "TestCaseTemplateId", - "TestCaseV2", - "TestCaseWithActualResultImplementation", - "VoidFunctionDefinition", - "VoidFunctionDefinitionThatTakesActualResult", - "VoidFunctionSignature", - "VoidFunctionSignatureThatTakesActualResult", - "problem", - "v_3", -] diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/__init__.py b/seed/fastapi/trace/resources/v_2/resources/v_3/__init__.py deleted file mode 100644 index 3663cdd5a..000000000 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/__init__.py +++ /dev/null @@ -1,91 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import ( - AssertCorrectnessCheck, - BasicCustomFiles, - BasicTestCaseTemplate, - CreateProblemRequestV2, - CustomFiles, - DeepEqualityCorrectnessCheck, - DefaultProvidedFile, - FileInfoV2, - Files, - FunctionImplementation, - FunctionImplementationForMultipleLanguages, - FunctionSignature, - GeneratedFiles, - GetBasicSolutionFileRequest, - GetBasicSolutionFileResponse, - GetFunctionSignatureRequest, - GetFunctionSignatureResponse, - GetGeneratedTestCaseFileRequest, - GetGeneratedTestCaseTemplateFileRequest, - LightweightProblemInfoV2, - NonVoidFunctionDefinition, - NonVoidFunctionSignature, - Parameter, - ParameterId, - ProblemInfoV2, - TestCaseExpects, - TestCaseFunction, - TestCaseId, - TestCaseImplementation, - TestCaseImplementationDescription, - TestCaseImplementationDescriptionBoard, - TestCaseImplementationReference, - TestCaseMetadata, - TestCaseTemplate, - TestCaseTemplateId, - TestCaseV2, - TestCaseWithActualResultImplementation, - VoidFunctionDefinition, - VoidFunctionDefinitionThatTakesActualResult, - VoidFunctionSignature, - VoidFunctionSignatureThatTakesActualResult, - problem, -) - -__all__ = [ - "AssertCorrectnessCheck", - "BasicCustomFiles", - "BasicTestCaseTemplate", - "CreateProblemRequestV2", - "CustomFiles", - "DeepEqualityCorrectnessCheck", - "DefaultProvidedFile", - "FileInfoV2", - "Files", - "FunctionImplementation", - "FunctionImplementationForMultipleLanguages", - "FunctionSignature", - "GeneratedFiles", - "GetBasicSolutionFileRequest", - "GetBasicSolutionFileResponse", - "GetFunctionSignatureRequest", - "GetFunctionSignatureResponse", - "GetGeneratedTestCaseFileRequest", - "GetGeneratedTestCaseTemplateFileRequest", - "LightweightProblemInfoV2", - "NonVoidFunctionDefinition", - "NonVoidFunctionSignature", - "Parameter", - "ParameterId", - "ProblemInfoV2", - "TestCaseExpects", - "TestCaseFunction", - "TestCaseId", - "TestCaseImplementation", - "TestCaseImplementationDescription", - "TestCaseImplementationDescriptionBoard", - "TestCaseImplementationReference", - "TestCaseMetadata", - "TestCaseTemplate", - "TestCaseTemplateId", - "TestCaseV2", - "TestCaseWithActualResultImplementation", - "VoidFunctionDefinition", - "VoidFunctionDefinitionThatTakesActualResult", - "VoidFunctionSignature", - "VoidFunctionSignatureThatTakesActualResult", - "problem", -] diff --git a/seed/fastapi/trace/resources/submission/__init__.py b/seed/fastapi/trace/submission/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/submission/__init__.py rename to seed/fastapi/trace/submission/__init__.py diff --git a/seed/fastapi/trace/resources/submission/service/__init__.py b/seed/fastapi/trace/submission/service/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/submission/service/__init__.py rename to seed/fastapi/trace/submission/service/__init__.py diff --git a/seed/fastapi/trace/resources/submission/service/service.py b/seed/fastapi/trace/submission/service/service.py similarity index 98% rename from seed/fastapi/trace/resources/submission/service/service.py rename to seed/fastapi/trace/submission/service/service.py index d2ff28b1a..d4d9d1732 100644 --- a/seed/fastapi/trace/resources/submission/service/service.py +++ b/seed/fastapi/trace/submission/service/service.py @@ -9,10 +9,10 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args from ...commons.types.language import Language +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ..types.execution_session_response import ExecutionSessionResponse from ..types.get_execution_session_state_response import GetExecutionSessionStateResponse diff --git a/seed/fastapi/trace/resources/submission/types/__init__.py b/seed/fastapi/trace/submission/types/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/submission/types/__init__.py rename to seed/fastapi/trace/submission/types/__init__.py diff --git a/seed/fastapi/trace/resources/submission/types/actual_result.py b/seed/fastapi/trace/submission/types/actual_result.py similarity index 86% rename from seed/fastapi/trace/resources/submission/types/actual_result.py rename to seed/fastapi/trace/submission/types/actual_result.py index f17d6e0ca..f73b178ef 100644 --- a/seed/fastapi/trace/resources/submission/types/actual_result.py +++ b/seed/fastapi/trace/submission/types/actual_result.py @@ -7,10 +7,10 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime from ...commons.types.variable_value import VariableValue +from ...core.datetime_utils import serialize_datetime from .exception_info import ExceptionInfo -from .exception_v_2 import ExceptionV2 as resources_submission_types_exception_v_2_ExceptionV2 +from .exception_v_2 import ExceptionV2 as submission_types_exception_v_2_ExceptionV2 try: import pydantic.v1 as pydantic # type: ignore @@ -27,7 +27,7 @@ def value(self, value: VariableValue) -> ActualResult: def exception(self, value: ExceptionInfo) -> ActualResult: return ActualResult(__root__=_ActualResult.Exception(**value.dict(exclude_unset=True), type="exception")) - def exception_v_2(self, value: resources_submission_types_exception_v_2_ExceptionV2) -> ActualResult: + def exception_v_2(self, value: submission_types_exception_v_2_ExceptionV2) -> ActualResult: return ActualResult(__root__=_ActualResult.ExceptionV2(type="exceptionV2", value=value)) @@ -41,7 +41,7 @@ def visit( self, value: typing.Callable[[VariableValue], T_Result], exception: typing.Callable[[ExceptionInfo], T_Result], - exception_v_2: typing.Callable[[resources_submission_types_exception_v_2_ExceptionV2], T_Result], + exception_v_2: typing.Callable[[submission_types_exception_v_2_ExceptionV2], T_Result], ) -> T_Result: if self.__root__.type == "value": return value(self.__root__.value) @@ -81,7 +81,7 @@ class Config: class ExceptionV2(pydantic.BaseModel): type: typing_extensions.Literal["exceptionV2"] - value: resources_submission_types_exception_v_2_ExceptionV2 + value: submission_types_exception_v_2_ExceptionV2 ActualResult.update_forward_refs() diff --git a/seed/fastapi/trace/resources/submission/types/building_executor_response.py b/seed/fastapi/trace/submission/types/building_executor_response.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/building_executor_response.py rename to seed/fastapi/trace/submission/types/building_executor_response.py index f69ce052e..8d20f6f21 100644 --- a/seed/fastapi/trace/resources/submission/types/building_executor_response.py +++ b/seed/fastapi/trace/submission/types/building_executor_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .execution_session_status import ExecutionSessionStatus from .submission_id import SubmissionId diff --git a/seed/fastapi/trace/resources/submission/types/code_execution_update.py b/seed/fastapi/trace/submission/types/code_execution_update.py similarity index 99% rename from seed/fastapi/trace/resources/submission/types/code_execution_update.py rename to seed/fastapi/trace/submission/types/code_execution_update.py index 5820ec76b..d33fb0756 100644 --- a/seed/fastapi/trace/resources/submission/types/code_execution_update.py +++ b/seed/fastapi/trace/submission/types/code_execution_update.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .building_executor_response import BuildingExecutorResponse from .errored_response import ErroredResponse from .finished_response import FinishedResponse diff --git a/seed/fastapi/trace/resources/submission/types/compile_error.py b/seed/fastapi/trace/submission/types/compile_error.py similarity index 93% rename from seed/fastapi/trace/resources/submission/types/compile_error.py rename to seed/fastapi/trace/submission/types/compile_error.py index 88e903677..cd455e529 100644 --- a/seed/fastapi/trace/resources/submission/types/compile_error.py +++ b/seed/fastapi/trace/submission/types/compile_error.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/custom_test_cases_unsupported.py b/seed/fastapi/trace/submission/types/custom_test_cases_unsupported.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/custom_test_cases_unsupported.py rename to seed/fastapi/trace/submission/types/custom_test_cases_unsupported.py index aa3898cd4..6eb8dc796 100644 --- a/seed/fastapi/trace/resources/submission/types/custom_test_cases_unsupported.py +++ b/seed/fastapi/trace/submission/types/custom_test_cases_unsupported.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.problem_id import ProblemId +from ...core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/fastapi/trace/resources/submission/types/error_info.py b/seed/fastapi/trace/submission/types/error_info.py similarity index 60% rename from seed/fastapi/trace/resources/submission/types/error_info.py rename to seed/fastapi/trace/submission/types/error_info.py index be9db2868..1d96c4e0b 100644 --- a/seed/fastapi/trace/resources/submission/types/error_info.py +++ b/seed/fastapi/trace/submission/types/error_info.py @@ -7,10 +7,10 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime -from .compile_error import CompileError as resources_submission_types_compile_error_CompileError -from .internal_error import InternalError as resources_submission_types_internal_error_InternalError -from .runtime_error import RuntimeError as resources_submission_types_runtime_error_RuntimeError +from ...core.datetime_utils import serialize_datetime +from .compile_error import CompileError as submission_types_compile_error_CompileError +from .internal_error import InternalError as submission_types_internal_error_InternalError +from .runtime_error import RuntimeError as submission_types_runtime_error_RuntimeError try: import pydantic.v1 as pydantic # type: ignore @@ -21,13 +21,13 @@ class _Factory: - def compile_error(self, value: resources_submission_types_compile_error_CompileError) -> ErrorInfo: + def compile_error(self, value: submission_types_compile_error_CompileError) -> ErrorInfo: return ErrorInfo(__root__=_ErrorInfo.CompileError(**value.dict(exclude_unset=True), type="compileError")) - def runtime_error(self, value: resources_submission_types_runtime_error_RuntimeError) -> ErrorInfo: + def runtime_error(self, value: submission_types_runtime_error_RuntimeError) -> ErrorInfo: return ErrorInfo(__root__=_ErrorInfo.RuntimeError(**value.dict(exclude_unset=True), type="runtimeError")) - def internal_error(self, value: resources_submission_types_internal_error_InternalError) -> ErrorInfo: + def internal_error(self, value: submission_types_internal_error_InternalError) -> ErrorInfo: return ErrorInfo(__root__=_ErrorInfo.InternalError(**value.dict(exclude_unset=True), type="internalError")) @@ -39,25 +39,21 @@ def get_as_union(self) -> typing.Union[_ErrorInfo.CompileError, _ErrorInfo.Runti def visit( self, - compile_error: typing.Callable[[resources_submission_types_compile_error_CompileError], T_Result], - runtime_error: typing.Callable[[resources_submission_types_runtime_error_RuntimeError], T_Result], - internal_error: typing.Callable[[resources_submission_types_internal_error_InternalError], T_Result], + compile_error: typing.Callable[[submission_types_compile_error_CompileError], T_Result], + runtime_error: typing.Callable[[submission_types_runtime_error_RuntimeError], T_Result], + internal_error: typing.Callable[[submission_types_internal_error_InternalError], T_Result], ) -> T_Result: if self.__root__.type == "compileError": return compile_error( - resources_submission_types_compile_error_CompileError( - **self.__root__.dict(exclude_unset=True, exclude={"type"}) - ) + submission_types_compile_error_CompileError(**self.__root__.dict(exclude_unset=True, exclude={"type"})) ) if self.__root__.type == "runtimeError": return runtime_error( - resources_submission_types_runtime_error_RuntimeError( - **self.__root__.dict(exclude_unset=True, exclude={"type"}) - ) + submission_types_runtime_error_RuntimeError(**self.__root__.dict(exclude_unset=True, exclude={"type"})) ) if self.__root__.type == "internalError": return internal_error( - resources_submission_types_internal_error_InternalError( + submission_types_internal_error_InternalError( **self.__root__.dict(exclude_unset=True, exclude={"type"}) ) ) @@ -81,19 +77,19 @@ class Config: class _ErrorInfo: - class CompileError(resources_submission_types_compile_error_CompileError): + class CompileError(submission_types_compile_error_CompileError): type: typing_extensions.Literal["compileError"] class Config: allow_population_by_field_name = True - class RuntimeError(resources_submission_types_runtime_error_RuntimeError): + class RuntimeError(submission_types_runtime_error_RuntimeError): type: typing_extensions.Literal["runtimeError"] class Config: allow_population_by_field_name = True - class InternalError(resources_submission_types_internal_error_InternalError): + class InternalError(submission_types_internal_error_InternalError): type: typing_extensions.Literal["internalError"] class Config: diff --git a/seed/fastapi/trace/resources/submission/types/errored_response.py b/seed/fastapi/trace/submission/types/errored_response.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/errored_response.py rename to seed/fastapi/trace/submission/types/errored_response.py index e605e1a9e..7cb0a5c3a 100644 --- a/seed/fastapi/trace/resources/submission/types/errored_response.py +++ b/seed/fastapi/trace/submission/types/errored_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .error_info import ErrorInfo from .submission_id import SubmissionId diff --git a/seed/fastapi/trace/resources/submission/types/exception_info.py b/seed/fastapi/trace/submission/types/exception_info.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/exception_info.py rename to seed/fastapi/trace/submission/types/exception_info.py index 4a734663e..782dec351 100644 --- a/seed/fastapi/trace/resources/submission/types/exception_info.py +++ b/seed/fastapi/trace/submission/types/exception_info.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/exception_v_2.py b/seed/fastapi/trace/submission/types/exception_v_2.py similarity index 97% rename from seed/fastapi/trace/resources/submission/types/exception_v_2.py rename to seed/fastapi/trace/submission/types/exception_v_2.py index 21cbcca0c..60c01ac08 100644 --- a/seed/fastapi/trace/resources/submission/types/exception_v_2.py +++ b/seed/fastapi/trace/submission/types/exception_v_2.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .exception_info import ExceptionInfo try: diff --git a/seed/fastapi/trace/resources/submission/types/execution_session_response.py b/seed/fastapi/trace/submission/types/execution_session_response.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/execution_session_response.py rename to seed/fastapi/trace/submission/types/execution_session_response.py index 7487d913e..bea81aa06 100644 --- a/seed/fastapi/trace/resources/submission/types/execution_session_response.py +++ b/seed/fastapi/trace/submission/types/execution_session_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.language import Language +from ...core.datetime_utils import serialize_datetime from .execution_session_status import ExecutionSessionStatus try: diff --git a/seed/fastapi/trace/resources/submission/types/execution_session_state.py b/seed/fastapi/trace/submission/types/execution_session_state.py similarity index 89% rename from seed/fastapi/trace/resources/submission/types/execution_session_state.py rename to seed/fastapi/trace/submission/types/execution_session_state.py index c790fc1ed..f25b44f85 100644 --- a/seed/fastapi/trace/resources/submission/types/execution_session_state.py +++ b/seed/fastapi/trace/submission/types/execution_session_state.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.language import Language +from ...core.datetime_utils import serialize_datetime from .execution_session_status import ExecutionSessionStatus try: @@ -16,7 +16,7 @@ class ExecutionSessionState(pydantic.BaseModel): last_time_contacted: typing.Optional[str] = pydantic.Field(alias="lastTimeContacted") session_id: str = pydantic.Field( - alias="sessionId", description=("The auto-generated session id. Formatted as a uuid.\n") + alias="sessionId", description="The auto-generated session id. Formatted as a uuid." ) is_warm_instance: bool = pydantic.Field(alias="isWarmInstance") aws_task_id: typing.Optional[str] = pydantic.Field(alias="awsTaskId") diff --git a/seed/fastapi/trace/resources/submission/types/execution_session_status.py b/seed/fastapi/trace/submission/types/execution_session_status.py similarity index 100% rename from seed/fastapi/trace/resources/submission/types/execution_session_status.py rename to seed/fastapi/trace/submission/types/execution_session_status.py diff --git a/seed/fastapi/trace/resources/submission/types/existing_submission_executing.py b/seed/fastapi/trace/submission/types/existing_submission_executing.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/existing_submission_executing.py rename to seed/fastapi/trace/submission/types/existing_submission_executing.py index 879f43d83..94c73b440 100644 --- a/seed/fastapi/trace/resources/submission/types/existing_submission_executing.py +++ b/seed/fastapi/trace/submission/types/existing_submission_executing.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/fastapi/trace/resources/submission/types/expression_location.py b/seed/fastapi/trace/submission/types/expression_location.py similarity index 93% rename from seed/fastapi/trace/resources/submission/types/expression_location.py rename to seed/fastapi/trace/submission/types/expression_location.py index fe04eb692..ca89e3cab 100644 --- a/seed/fastapi/trace/resources/submission/types/expression_location.py +++ b/seed/fastapi/trace/submission/types/expression_location.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/finished_response.py b/seed/fastapi/trace/submission/types/finished_response.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/finished_response.py rename to seed/fastapi/trace/submission/types/finished_response.py index 7a12d6ec8..711b756ae 100644 --- a/seed/fastapi/trace/resources/submission/types/finished_response.py +++ b/seed/fastapi/trace/submission/types/finished_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/fastapi/trace/resources/submission/types/get_execution_session_state_response.py b/seed/fastapi/trace/submission/types/get_execution_session_state_response.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/get_execution_session_state_response.py rename to seed/fastapi/trace/submission/types/get_execution_session_state_response.py index 8b7516058..78e2fc02b 100644 --- a/seed/fastapi/trace/resources/submission/types/get_execution_session_state_response.py +++ b/seed/fastapi/trace/submission/types/get_execution_session_state_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .execution_session_state import ExecutionSessionState try: diff --git a/seed/fastapi/trace/resources/submission/types/get_submission_state_response.py b/seed/fastapi/trace/submission/types/get_submission_state_response.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/get_submission_state_response.py rename to seed/fastapi/trace/submission/types/get_submission_state_response.py index 281b27818..5026e4e24 100644 --- a/seed/fastapi/trace/resources/submission/types/get_submission_state_response.py +++ b/seed/fastapi/trace/submission/types/get_submission_state_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.language import Language +from ...core.datetime_utils import serialize_datetime from .submission_type_state import SubmissionTypeState try: diff --git a/seed/fastapi/trace/resources/submission/types/get_trace_responses_page_request.py b/seed/fastapi/trace/submission/types/get_trace_responses_page_request.py similarity index 93% rename from seed/fastapi/trace/resources/submission/types/get_trace_responses_page_request.py rename to seed/fastapi/trace/submission/types/get_trace_responses_page_request.py index 6b548a492..cc488c2d5 100644 --- a/seed/fastapi/trace/resources/submission/types/get_trace_responses_page_request.py +++ b/seed/fastapi/trace/submission/types/get_trace_responses_page_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/graded_response.py b/seed/fastapi/trace/submission/types/graded_response.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/graded_response.py rename to seed/fastapi/trace/submission/types/graded_response.py index 9aab210b4..16eb3dd83 100644 --- a/seed/fastapi/trace/resources/submission/types/graded_response.py +++ b/seed/fastapi/trace/submission/types/graded_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .submission_id import SubmissionId from .test_case_result_with_stdout import TestCaseResultWithStdout diff --git a/seed/fastapi/trace/resources/submission/types/graded_response_v_2.py b/seed/fastapi/trace/submission/types/graded_response_v_2.py similarity index 89% rename from seed/fastapi/trace/resources/submission/types/graded_response_v_2.py rename to seed/fastapi/trace/submission/types/graded_response_v_2.py index 3fc27c57c..dce11ffe4 100644 --- a/seed/fastapi/trace/resources/submission/types/graded_response_v_2.py +++ b/seed/fastapi/trace/submission/types/graded_response_v_2.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...v_2.resources.problem.types.test_case_id import TestCaseId +from ...core.datetime_utils import serialize_datetime +from ...v_2.problem.types.test_case_id import TestCaseId from .submission_id import SubmissionId from .test_case_grade import TestCaseGrade diff --git a/seed/fastapi/trace/resources/submission/types/graded_test_case_update.py b/seed/fastapi/trace/submission/types/graded_test_case_update.py similarity index 88% rename from seed/fastapi/trace/resources/submission/types/graded_test_case_update.py rename to seed/fastapi/trace/submission/types/graded_test_case_update.py index 66ea321c6..0903a385c 100644 --- a/seed/fastapi/trace/resources/submission/types/graded_test_case_update.py +++ b/seed/fastapi/trace/submission/types/graded_test_case_update.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...v_2.resources.problem.types.test_case_id import TestCaseId +from ...core.datetime_utils import serialize_datetime +from ...v_2.problem.types.test_case_id import TestCaseId from .test_case_grade import TestCaseGrade try: diff --git a/seed/fastapi/trace/resources/submission/types/initialize_problem_request.py b/seed/fastapi/trace/submission/types/initialize_problem_request.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/initialize_problem_request.py rename to seed/fastapi/trace/submission/types/initialize_problem_request.py index 6a5efb774..853731b4d 100644 --- a/seed/fastapi/trace/resources/submission/types/initialize_problem_request.py +++ b/seed/fastapi/trace/submission/types/initialize_problem_request.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.problem_id import ProblemId +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/internal_error.py b/seed/fastapi/trace/submission/types/internal_error.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/internal_error.py rename to seed/fastapi/trace/submission/types/internal_error.py index 2718318dd..aeb3bc9b9 100644 --- a/seed/fastapi/trace/resources/submission/types/internal_error.py +++ b/seed/fastapi/trace/submission/types/internal_error.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .exception_info import ExceptionInfo try: diff --git a/seed/fastapi/trace/resources/submission/types/invalid_request_cause.py b/seed/fastapi/trace/submission/types/invalid_request_cause.py similarity index 78% rename from seed/fastapi/trace/resources/submission/types/invalid_request_cause.py rename to seed/fastapi/trace/submission/types/invalid_request_cause.py index ac0d29e68..19b2e3fd3 100644 --- a/seed/fastapi/trace/resources/submission/types/invalid_request_cause.py +++ b/seed/fastapi/trace/submission/types/invalid_request_cause.py @@ -7,12 +7,12 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .custom_test_cases_unsupported import ( - CustomTestCasesUnsupported as resources_submission_types_custom_test_cases_unsupported_CustomTestCasesUnsupported, + CustomTestCasesUnsupported as submission_types_custom_test_cases_unsupported_CustomTestCasesUnsupported, ) from .submission_id_not_found import ( - SubmissionIdNotFound as resources_submission_types_submission_id_not_found_SubmissionIdNotFound, + SubmissionIdNotFound as submission_types_submission_id_not_found_SubmissionIdNotFound, ) from .unexpected_language_error import UnexpectedLanguageError @@ -26,7 +26,7 @@ class _Factory: def submission_id_not_found( - self, value: resources_submission_types_submission_id_not_found_SubmissionIdNotFound + self, value: submission_types_submission_id_not_found_SubmissionIdNotFound ) -> InvalidRequestCause: return InvalidRequestCause( __root__=_InvalidRequestCause.SubmissionIdNotFound( @@ -35,7 +35,7 @@ def submission_id_not_found( ) def custom_test_cases_unsupported( - self, value: resources_submission_types_custom_test_cases_unsupported_CustomTestCasesUnsupported + self, value: submission_types_custom_test_cases_unsupported_CustomTestCasesUnsupported ) -> InvalidRequestCause: return InvalidRequestCause( __root__=_InvalidRequestCause.CustomTestCasesUnsupported( @@ -66,22 +66,22 @@ def get_as_union( def visit( self, submission_id_not_found: typing.Callable[ - [resources_submission_types_submission_id_not_found_SubmissionIdNotFound], T_Result + [submission_types_submission_id_not_found_SubmissionIdNotFound], T_Result ], custom_test_cases_unsupported: typing.Callable[ - [resources_submission_types_custom_test_cases_unsupported_CustomTestCasesUnsupported], T_Result + [submission_types_custom_test_cases_unsupported_CustomTestCasesUnsupported], T_Result ], unexpected_language: typing.Callable[[UnexpectedLanguageError], T_Result], ) -> T_Result: if self.__root__.type == "submissionIdNotFound": return submission_id_not_found( - resources_submission_types_submission_id_not_found_SubmissionIdNotFound( + submission_types_submission_id_not_found_SubmissionIdNotFound( **self.__root__.dict(exclude_unset=True, exclude={"type"}) ) ) if self.__root__.type == "customTestCasesUnsupported": return custom_test_cases_unsupported( - resources_submission_types_custom_test_cases_unsupported_CustomTestCasesUnsupported( + submission_types_custom_test_cases_unsupported_CustomTestCasesUnsupported( **self.__root__.dict(exclude_unset=True, exclude={"type"}) ) ) @@ -113,15 +113,13 @@ class Config: class _InvalidRequestCause: - class SubmissionIdNotFound(resources_submission_types_submission_id_not_found_SubmissionIdNotFound): + class SubmissionIdNotFound(submission_types_submission_id_not_found_SubmissionIdNotFound): type: typing_extensions.Literal["submissionIdNotFound"] class Config: allow_population_by_field_name = True - class CustomTestCasesUnsupported( - resources_submission_types_custom_test_cases_unsupported_CustomTestCasesUnsupported - ): + class CustomTestCasesUnsupported(submission_types_custom_test_cases_unsupported_CustomTestCasesUnsupported): type: typing_extensions.Literal["customTestCasesUnsupported"] class Config: diff --git a/seed/fastapi/trace/resources/submission/types/invalid_request_response.py b/seed/fastapi/trace/submission/types/invalid_request_response.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/invalid_request_response.py rename to seed/fastapi/trace/submission/types/invalid_request_response.py index 2eefaf66e..87f64f120 100644 --- a/seed/fastapi/trace/resources/submission/types/invalid_request_response.py +++ b/seed/fastapi/trace/submission/types/invalid_request_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .invalid_request_cause import InvalidRequestCause from .submission_request import SubmissionRequest diff --git a/seed/fastapi/trace/resources/submission/types/lightweight_stackframe_information.py b/seed/fastapi/trace/submission/types/lightweight_stackframe_information.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/lightweight_stackframe_information.py rename to seed/fastapi/trace/submission/types/lightweight_stackframe_information.py index 149d818a3..4ac1cffb6 100644 --- a/seed/fastapi/trace/resources/submission/types/lightweight_stackframe_information.py +++ b/seed/fastapi/trace/submission/types/lightweight_stackframe_information.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/recorded_response_notification.py b/seed/fastapi/trace/submission/types/recorded_response_notification.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/recorded_response_notification.py rename to seed/fastapi/trace/submission/types/recorded_response_notification.py index 4204903bb..31a8420ea 100644 --- a/seed/fastapi/trace/resources/submission/types/recorded_response_notification.py +++ b/seed/fastapi/trace/submission/types/recorded_response_notification.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/fastapi/trace/resources/submission/types/recorded_test_case_update.py b/seed/fastapi/trace/submission/types/recorded_test_case_update.py similarity index 89% rename from seed/fastapi/trace/resources/submission/types/recorded_test_case_update.py rename to seed/fastapi/trace/submission/types/recorded_test_case_update.py index 1e8c67951..f08904a61 100644 --- a/seed/fastapi/trace/resources/submission/types/recorded_test_case_update.py +++ b/seed/fastapi/trace/submission/types/recorded_test_case_update.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...v_2.resources.problem.types.test_case_id import TestCaseId +from ...core.datetime_utils import serialize_datetime +from ...v_2.problem.types.test_case_id import TestCaseId try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/recording_response_notification.py b/seed/fastapi/trace/submission/types/recording_response_notification.py similarity index 96% rename from seed/fastapi/trace/resources/submission/types/recording_response_notification.py rename to seed/fastapi/trace/submission/types/recording_response_notification.py index c15cd174f..53dc1a357 100644 --- a/seed/fastapi/trace/resources/submission/types/recording_response_notification.py +++ b/seed/fastapi/trace/submission/types/recording_response_notification.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .lightweight_stackframe_information import LightweightStackframeInformation from .submission_id import SubmissionId from .traced_file import TracedFile diff --git a/seed/fastapi/trace/resources/submission/types/running_response.py b/seed/fastapi/trace/submission/types/running_response.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/running_response.py rename to seed/fastapi/trace/submission/types/running_response.py index 9b1039265..803ea20c0 100644 --- a/seed/fastapi/trace/resources/submission/types/running_response.py +++ b/seed/fastapi/trace/submission/types/running_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .running_submission_state import RunningSubmissionState from .submission_id import SubmissionId diff --git a/seed/fastapi/trace/resources/submission/types/running_submission_state.py b/seed/fastapi/trace/submission/types/running_submission_state.py similarity index 100% rename from seed/fastapi/trace/resources/submission/types/running_submission_state.py rename to seed/fastapi/trace/submission/types/running_submission_state.py diff --git a/seed/fastapi/trace/resources/submission/types/runtime_error.py b/seed/fastapi/trace/submission/types/runtime_error.py similarity index 93% rename from seed/fastapi/trace/resources/submission/types/runtime_error.py rename to seed/fastapi/trace/submission/types/runtime_error.py index 6bf1e4cc9..36b38bbdd 100644 --- a/seed/fastapi/trace/resources/submission/types/runtime_error.py +++ b/seed/fastapi/trace/submission/types/runtime_error.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/scope.py b/seed/fastapi/trace/submission/types/scope.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/scope.py rename to seed/fastapi/trace/submission/types/scope.py index 826c50569..f2786423a 100644 --- a/seed/fastapi/trace/resources/submission/types/scope.py +++ b/seed/fastapi/trace/submission/types/scope.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.debug_variable_value import DebugVariableValue +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/share_id.py b/seed/fastapi/trace/submission/types/share_id.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/share_id.py rename to seed/fastapi/trace/submission/types/share_id.py index bcd256e9f..14cb0677f 100644 --- a/seed/fastapi/trace/resources/submission/types/share_id.py +++ b/seed/fastapi/trace/submission/types/share_id.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/stack_frame.py b/seed/fastapi/trace/submission/types/stack_frame.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/stack_frame.py rename to seed/fastapi/trace/submission/types/stack_frame.py index ae94fcf23..448d17ef0 100644 --- a/seed/fastapi/trace/resources/submission/types/stack_frame.py +++ b/seed/fastapi/trace/submission/types/stack_frame.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .scope import Scope try: diff --git a/seed/fastapi/trace/resources/submission/types/stack_information.py b/seed/fastapi/trace/submission/types/stack_information.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/stack_information.py rename to seed/fastapi/trace/submission/types/stack_information.py index a5333dece..b2000e1e3 100644 --- a/seed/fastapi/trace/resources/submission/types/stack_information.py +++ b/seed/fastapi/trace/submission/types/stack_information.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .stack_frame import StackFrame try: diff --git a/seed/fastapi/trace/resources/submission/types/stderr_response.py b/seed/fastapi/trace/submission/types/stderr_response.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/stderr_response.py rename to seed/fastapi/trace/submission/types/stderr_response.py index 14ba1a0d3..3b624b128 100644 --- a/seed/fastapi/trace/resources/submission/types/stderr_response.py +++ b/seed/fastapi/trace/submission/types/stderr_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/fastapi/trace/resources/submission/types/stdout_response.py b/seed/fastapi/trace/submission/types/stdout_response.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/stdout_response.py rename to seed/fastapi/trace/submission/types/stdout_response.py index d08b21299..7c688221a 100644 --- a/seed/fastapi/trace/resources/submission/types/stdout_response.py +++ b/seed/fastapi/trace/submission/types/stdout_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/fastapi/trace/resources/submission/types/stop_request.py b/seed/fastapi/trace/submission/types/stop_request.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/stop_request.py rename to seed/fastapi/trace/submission/types/stop_request.py index 52b4dd6ce..3e3a8b6a7 100644 --- a/seed/fastapi/trace/resources/submission/types/stop_request.py +++ b/seed/fastapi/trace/submission/types/stop_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/fastapi/trace/resources/submission/types/stopped_response.py b/seed/fastapi/trace/submission/types/stopped_response.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/stopped_response.py rename to seed/fastapi/trace/submission/types/stopped_response.py index 861d61c87..65f6e8418 100644 --- a/seed/fastapi/trace/resources/submission/types/stopped_response.py +++ b/seed/fastapi/trace/submission/types/stopped_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/fastapi/trace/resources/submission/types/submission_file_info.py b/seed/fastapi/trace/submission/types/submission_file_info.py similarity index 93% rename from seed/fastapi/trace/resources/submission/types/submission_file_info.py rename to seed/fastapi/trace/submission/types/submission_file_info.py index 9db5375c0..f9f6ebc39 100644 --- a/seed/fastapi/trace/resources/submission/types/submission_file_info.py +++ b/seed/fastapi/trace/submission/types/submission_file_info.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/submission_id.py b/seed/fastapi/trace/submission/types/submission_id.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/submission_id.py rename to seed/fastapi/trace/submission/types/submission_id.py index 25b3f1371..e290a5486 100644 --- a/seed/fastapi/trace/resources/submission/types/submission_id.py +++ b/seed/fastapi/trace/submission/types/submission_id.py @@ -6,7 +6,7 @@ import typing import uuid -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/submission_id_not_found.py b/seed/fastapi/trace/submission/types/submission_id_not_found.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/submission_id_not_found.py rename to seed/fastapi/trace/submission/types/submission_id_not_found.py index 2e42283b1..1a0a4fa71 100644 --- a/seed/fastapi/trace/resources/submission/types/submission_id_not_found.py +++ b/seed/fastapi/trace/submission/types/submission_id_not_found.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/fastapi/trace/resources/submission/types/submission_request.py b/seed/fastapi/trace/submission/types/submission_request.py similarity index 89% rename from seed/fastapi/trace/resources/submission/types/submission_request.py rename to seed/fastapi/trace/submission/types/submission_request.py index 2e7f6c3b0..39dfbd5b4 100644 --- a/seed/fastapi/trace/resources/submission/types/submission_request.py +++ b/seed/fastapi/trace/submission/types/submission_request.py @@ -7,9 +7,9 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .initialize_problem_request import ( - InitializeProblemRequest as resources_submission_types_initialize_problem_request_InitializeProblemRequest, + InitializeProblemRequest as submission_types_initialize_problem_request_InitializeProblemRequest, ) from .stop_request import StopRequest from .submit_request_v_2 import SubmitRequestV2 @@ -25,7 +25,7 @@ class _Factory: def initialize_problem_request( - self, value: resources_submission_types_initialize_problem_request_InitializeProblemRequest + self, value: submission_types_initialize_problem_request_InitializeProblemRequest ) -> SubmissionRequest: return SubmissionRequest( __root__=_SubmissionRequest.InitializeProblemRequest( @@ -69,7 +69,7 @@ def get_as_union( def visit( self, initialize_problem_request: typing.Callable[ - [resources_submission_types_initialize_problem_request_InitializeProblemRequest], T_Result + [submission_types_initialize_problem_request_InitializeProblemRequest], T_Result ], initialize_workspace_request: typing.Callable[[], T_Result], submit_v_2: typing.Callable[[SubmitRequestV2], T_Result], @@ -78,7 +78,7 @@ def visit( ) -> T_Result: if self.__root__.type == "initializeProblemRequest": return initialize_problem_request( - resources_submission_types_initialize_problem_request_InitializeProblemRequest( + submission_types_initialize_problem_request_InitializeProblemRequest( **self.__root__.dict(exclude_unset=True, exclude={"type"}) ) ) @@ -116,7 +116,7 @@ class Config: class _SubmissionRequest: - class InitializeProblemRequest(resources_submission_types_initialize_problem_request_InitializeProblemRequest): + class InitializeProblemRequest(submission_types_initialize_problem_request_InitializeProblemRequest): type: typing_extensions.Literal["initializeProblemRequest"] class Config: diff --git a/seed/fastapi/trace/resources/submission/types/submission_response.py b/seed/fastapi/trace/submission/types/submission_response.py similarity index 90% rename from seed/fastapi/trace/resources/submission/types/submission_response.py rename to seed/fastapi/trace/submission/types/submission_response.py index 27d502f03..1d9033827 100644 --- a/seed/fastapi/trace/resources/submission/types/submission_response.py +++ b/seed/fastapi/trace/submission/types/submission_response.py @@ -7,11 +7,9 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime from ...commons.types.problem_id import ProblemId -from .code_execution_update import ( - CodeExecutionUpdate as resources_submission_types_code_execution_update_CodeExecutionUpdate, -) +from ...core.datetime_utils import serialize_datetime +from .code_execution_update import CodeExecutionUpdate as submission_types_code_execution_update_CodeExecutionUpdate from .exception_info import ExceptionInfo from .terminated_response import TerminatedResponse @@ -41,7 +39,7 @@ def server_errored(self, value: ExceptionInfo) -> SubmissionResponse: ) def code_execution_update( - self, value: resources_submission_types_code_execution_update_CodeExecutionUpdate + self, value: submission_types_code_execution_update_CodeExecutionUpdate ) -> SubmissionResponse: return SubmissionResponse( __root__=_SubmissionResponse.CodeExecutionUpdate(type="codeExecutionUpdate", value=value) @@ -74,9 +72,7 @@ def visit( problem_initialized: typing.Callable[[ProblemId], T_Result], workspace_initialized: typing.Callable[[], T_Result], server_errored: typing.Callable[[ExceptionInfo], T_Result], - code_execution_update: typing.Callable[ - [resources_submission_types_code_execution_update_CodeExecutionUpdate], T_Result - ], + code_execution_update: typing.Callable[[submission_types_code_execution_update_CodeExecutionUpdate], T_Result], terminated: typing.Callable[[TerminatedResponse], T_Result], ) -> T_Result: if self.__root__.type == "serverInitialized": @@ -136,7 +132,7 @@ class Config: class CodeExecutionUpdate(pydantic.BaseModel): type: typing_extensions.Literal["codeExecutionUpdate"] - value: resources_submission_types_code_execution_update_CodeExecutionUpdate + value: submission_types_code_execution_update_CodeExecutionUpdate class Terminated(TerminatedResponse): type: typing_extensions.Literal["terminated"] diff --git a/seed/fastapi/trace/resources/submission/types/submission_status_for_test_case.py b/seed/fastapi/trace/submission/types/submission_status_for_test_case.py similarity index 98% rename from seed/fastapi/trace/resources/submission/types/submission_status_for_test_case.py rename to seed/fastapi/trace/submission/types/submission_status_for_test_case.py index 2447c4799..888ef34fb 100644 --- a/seed/fastapi/trace/resources/submission/types/submission_status_for_test_case.py +++ b/seed/fastapi/trace/submission/types/submission_status_for_test_case.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .test_case_grade import TestCaseGrade from .test_case_result_with_stdout import TestCaseResultWithStdout from .traced_test_case import TracedTestCase diff --git a/seed/fastapi/trace/resources/submission/types/submission_status_v_2.py b/seed/fastapi/trace/submission/types/submission_status_v_2.py similarity index 98% rename from seed/fastapi/trace/resources/submission/types/submission_status_v_2.py rename to seed/fastapi/trace/submission/types/submission_status_v_2.py index d8448f748..7a7f53aec 100644 --- a/seed/fastapi/trace/resources/submission/types/submission_status_v_2.py +++ b/seed/fastapi/trace/submission/types/submission_status_v_2.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .test_submission_status_v_2 import TestSubmissionStatusV2 from .workspace_submission_status_v_2 import WorkspaceSubmissionStatusV2 diff --git a/seed/fastapi/trace/resources/submission/types/submission_type_enum.py b/seed/fastapi/trace/submission/types/submission_type_enum.py similarity index 100% rename from seed/fastapi/trace/resources/submission/types/submission_type_enum.py rename to seed/fastapi/trace/submission/types/submission_type_enum.py diff --git a/seed/fastapi/trace/resources/submission/types/submission_type_state.py b/seed/fastapi/trace/submission/types/submission_type_state.py similarity index 98% rename from seed/fastapi/trace/resources/submission/types/submission_type_state.py rename to seed/fastapi/trace/submission/types/submission_type_state.py index bad343a3a..ef0243962 100644 --- a/seed/fastapi/trace/resources/submission/types/submission_type_state.py +++ b/seed/fastapi/trace/submission/types/submission_type_state.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .test_submission_state import TestSubmissionState from .workspace_submission_state import WorkspaceSubmissionState diff --git a/seed/fastapi/trace/resources/submission/types/submit_request_v_2.py b/seed/fastapi/trace/submission/types/submit_request_v_2.py similarity index 96% rename from seed/fastapi/trace/resources/submission/types/submit_request_v_2.py rename to seed/fastapi/trace/submission/types/submit_request_v_2.py index d8749223a..77b2030d1 100644 --- a/seed/fastapi/trace/resources/submission/types/submit_request_v_2.py +++ b/seed/fastapi/trace/submission/types/submit_request_v_2.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.language import Language from ...commons.types.problem_id import ProblemId +from ...core.datetime_utils import serialize_datetime from .submission_file_info import SubmissionFileInfo from .submission_id import SubmissionId diff --git a/seed/fastapi/trace/resources/submission/types/terminated_response.py b/seed/fastapi/trace/submission/types/terminated_response.py similarity index 93% rename from seed/fastapi/trace/resources/submission/types/terminated_response.py rename to seed/fastapi/trace/submission/types/terminated_response.py index db5fb41a2..ee40afd7b 100644 --- a/seed/fastapi/trace/resources/submission/types/terminated_response.py +++ b/seed/fastapi/trace/submission/types/terminated_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/test_case_grade.py b/seed/fastapi/trace/submission/types/test_case_grade.py similarity index 97% rename from seed/fastapi/trace/resources/submission/types/test_case_grade.py rename to seed/fastapi/trace/submission/types/test_case_grade.py index cda2437ac..f4402f5ec 100644 --- a/seed/fastapi/trace/resources/submission/types/test_case_grade.py +++ b/seed/fastapi/trace/submission/types/test_case_grade.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .test_case_hidden_grade import TestCaseHiddenGrade from .test_case_non_hidden_grade import TestCaseNonHiddenGrade diff --git a/seed/fastapi/trace/resources/submission/types/test_case_hidden_grade.py b/seed/fastapi/trace/submission/types/test_case_hidden_grade.py similarity index 93% rename from seed/fastapi/trace/resources/submission/types/test_case_hidden_grade.py rename to seed/fastapi/trace/submission/types/test_case_hidden_grade.py index ed6341573..12efc4f2d 100644 --- a/seed/fastapi/trace/resources/submission/types/test_case_hidden_grade.py +++ b/seed/fastapi/trace/submission/types/test_case_hidden_grade.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/test_case_non_hidden_grade.py b/seed/fastapi/trace/submission/types/test_case_non_hidden_grade.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/test_case_non_hidden_grade.py rename to seed/fastapi/trace/submission/types/test_case_non_hidden_grade.py index 13ddd72e5..5fee09bd5 100644 --- a/seed/fastapi/trace/resources/submission/types/test_case_non_hidden_grade.py +++ b/seed/fastapi/trace/submission/types/test_case_non_hidden_grade.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.variable_value import VariableValue +from ...core.datetime_utils import serialize_datetime from .exception_v_2 import ExceptionV2 try: diff --git a/seed/fastapi/trace/resources/submission/types/test_case_result.py b/seed/fastapi/trace/submission/types/test_case_result.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/test_case_result.py rename to seed/fastapi/trace/submission/types/test_case_result.py index 3947823bf..90c7f2892 100644 --- a/seed/fastapi/trace/resources/submission/types/test_case_result.py +++ b/seed/fastapi/trace/submission/types/test_case_result.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.variable_value import VariableValue +from ...core.datetime_utils import serialize_datetime from .actual_result import ActualResult try: diff --git a/seed/fastapi/trace/resources/submission/types/test_case_result_with_stdout.py b/seed/fastapi/trace/submission/types/test_case_result_with_stdout.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/test_case_result_with_stdout.py rename to seed/fastapi/trace/submission/types/test_case_result_with_stdout.py index f8fcc53a8..d466c0e99 100644 --- a/seed/fastapi/trace/resources/submission/types/test_case_result_with_stdout.py +++ b/seed/fastapi/trace/submission/types/test_case_result_with_stdout.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .test_case_result import TestCaseResult try: diff --git a/seed/fastapi/trace/resources/submission/types/test_submission_state.py b/seed/fastapi/trace/submission/types/test_submission_state.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/test_submission_state.py rename to seed/fastapi/trace/submission/types/test_submission_state.py index 06f70dcd6..57f62c3a8 100644 --- a/seed/fastapi/trace/resources/submission/types/test_submission_state.py +++ b/seed/fastapi/trace/submission/types/test_submission_state.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.problem_id import ProblemId from ...commons.types.test_case import TestCase +from ...core.datetime_utils import serialize_datetime from .test_submission_status import TestSubmissionStatus try: diff --git a/seed/fastapi/trace/resources/submission/types/test_submission_status.py b/seed/fastapi/trace/submission/types/test_submission_status.py similarity index 98% rename from seed/fastapi/trace/resources/submission/types/test_submission_status.py rename to seed/fastapi/trace/submission/types/test_submission_status.py index 1234fccbf..b97a352ff 100644 --- a/seed/fastapi/trace/resources/submission/types/test_submission_status.py +++ b/seed/fastapi/trace/submission/types/test_submission_status.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .error_info import ErrorInfo from .running_submission_state import RunningSubmissionState from .submission_status_for_test_case import SubmissionStatusForTestCase diff --git a/seed/fastapi/trace/resources/submission/types/test_submission_status_v_2.py b/seed/fastapi/trace/submission/types/test_submission_status_v_2.py similarity index 90% rename from seed/fastapi/trace/resources/submission/types/test_submission_status_v_2.py rename to seed/fastapi/trace/submission/types/test_submission_status_v_2.py index 9809aa6ef..143beb1d8 100644 --- a/seed/fastapi/trace/resources/submission/types/test_submission_status_v_2.py +++ b/seed/fastapi/trace/submission/types/test_submission_status_v_2.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.problem_id import ProblemId -from ...v_2.resources.problem.types.problem_info_v_2 import ProblemInfoV2 +from ...core.datetime_utils import serialize_datetime +from ...v_2.problem.types.problem_info_v_2 import ProblemInfoV2 from .test_submission_update import TestSubmissionUpdate try: diff --git a/seed/fastapi/trace/resources/submission/types/test_submission_update.py b/seed/fastapi/trace/submission/types/test_submission_update.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/test_submission_update.py rename to seed/fastapi/trace/submission/types/test_submission_update.py index 8ca2daad2..d1fd3edc9 100644 --- a/seed/fastapi/trace/resources/submission/types/test_submission_update.py +++ b/seed/fastapi/trace/submission/types/test_submission_update.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .test_submission_update_info import TestSubmissionUpdateInfo try: diff --git a/seed/fastapi/trace/resources/submission/types/test_submission_update_info.py b/seed/fastapi/trace/submission/types/test_submission_update_info.py similarity index 98% rename from seed/fastapi/trace/resources/submission/types/test_submission_update_info.py rename to seed/fastapi/trace/submission/types/test_submission_update_info.py index 4044d67e0..03dc19275 100644 --- a/seed/fastapi/trace/resources/submission/types/test_submission_update_info.py +++ b/seed/fastapi/trace/submission/types/test_submission_update_info.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .error_info import ErrorInfo from .graded_test_case_update import GradedTestCaseUpdate from .recorded_test_case_update import RecordedTestCaseUpdate diff --git a/seed/fastapi/trace/resources/submission/types/trace_response.py b/seed/fastapi/trace/submission/types/trace_response.py similarity index 96% rename from seed/fastapi/trace/resources/submission/types/trace_response.py rename to seed/fastapi/trace/submission/types/trace_response.py index 7d62f6d68..23f8f2294 100644 --- a/seed/fastapi/trace/resources/submission/types/trace_response.py +++ b/seed/fastapi/trace/submission/types/trace_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.debug_variable_value import DebugVariableValue +from ...core.datetime_utils import serialize_datetime from .expression_location import ExpressionLocation from .stack_information import StackInformation from .submission_id import SubmissionId diff --git a/seed/fastapi/trace/resources/submission/types/trace_response_v_2.py b/seed/fastapi/trace/submission/types/trace_response_v_2.py similarity index 96% rename from seed/fastapi/trace/resources/submission/types/trace_response_v_2.py rename to seed/fastapi/trace/submission/types/trace_response_v_2.py index 6ad2d289e..ce19f782d 100644 --- a/seed/fastapi/trace/resources/submission/types/trace_response_v_2.py +++ b/seed/fastapi/trace/submission/types/trace_response_v_2.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.debug_variable_value import DebugVariableValue +from ...core.datetime_utils import serialize_datetime from .expression_location import ExpressionLocation from .stack_information import StackInformation from .submission_id import SubmissionId diff --git a/seed/fastapi/trace/resources/submission/types/trace_responses_page.py b/seed/fastapi/trace/submission/types/trace_responses_page.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/trace_responses_page.py rename to seed/fastapi/trace/submission/types/trace_responses_page.py index ac860ad88..18bdaa6f6 100644 --- a/seed/fastapi/trace/resources/submission/types/trace_responses_page.py +++ b/seed/fastapi/trace/submission/types/trace_responses_page.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .trace_response import TraceResponse try: diff --git a/seed/fastapi/trace/resources/submission/types/trace_responses_page_v_2.py b/seed/fastapi/trace/submission/types/trace_responses_page_v_2.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/trace_responses_page_v_2.py rename to seed/fastapi/trace/submission/types/trace_responses_page_v_2.py index 6fffd42c4..c4447ed07 100644 --- a/seed/fastapi/trace/resources/submission/types/trace_responses_page_v_2.py +++ b/seed/fastapi/trace/submission/types/trace_responses_page_v_2.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .trace_response_v_2 import TraceResponseV2 try: diff --git a/seed/fastapi/trace/resources/submission/types/traced_file.py b/seed/fastapi/trace/submission/types/traced_file.py similarity index 93% rename from seed/fastapi/trace/resources/submission/types/traced_file.py rename to seed/fastapi/trace/submission/types/traced_file.py index 76343be84..f44a01814 100644 --- a/seed/fastapi/trace/resources/submission/types/traced_file.py +++ b/seed/fastapi/trace/submission/types/traced_file.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/traced_test_case.py b/seed/fastapi/trace/submission/types/traced_test_case.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/traced_test_case.py rename to seed/fastapi/trace/submission/types/traced_test_case.py index 072680b2b..16e4ee9b3 100644 --- a/seed/fastapi/trace/resources/submission/types/traced_test_case.py +++ b/seed/fastapi/trace/submission/types/traced_test_case.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .test_case_result_with_stdout import TestCaseResultWithStdout try: diff --git a/seed/fastapi/trace/resources/submission/types/unexpected_language_error.py b/seed/fastapi/trace/submission/types/unexpected_language_error.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/unexpected_language_error.py rename to seed/fastapi/trace/submission/types/unexpected_language_error.py index c26634a5c..d6e419e8c 100644 --- a/seed/fastapi/trace/resources/submission/types/unexpected_language_error.py +++ b/seed/fastapi/trace/submission/types/unexpected_language_error.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.language import Language +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/workspace_files.py b/seed/fastapi/trace/submission/types/workspace_files.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/workspace_files.py rename to seed/fastapi/trace/submission/types/workspace_files.py index b0e3e4016..e5806aee5 100644 --- a/seed/fastapi/trace/resources/submission/types/workspace_files.py +++ b/seed/fastapi/trace/submission/types/workspace_files.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.file_info import FileInfo +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/workspace_ran_response.py b/seed/fastapi/trace/submission/types/workspace_ran_response.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/workspace_ran_response.py rename to seed/fastapi/trace/submission/types/workspace_ran_response.py index bbccc1397..9dc8fcb5b 100644 --- a/seed/fastapi/trace/resources/submission/types/workspace_ran_response.py +++ b/seed/fastapi/trace/submission/types/workspace_ran_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .submission_id import SubmissionId from .workspace_run_details import WorkspaceRunDetails diff --git a/seed/fastapi/trace/resources/submission/types/workspace_run_details.py b/seed/fastapi/trace/submission/types/workspace_run_details.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/workspace_run_details.py rename to seed/fastapi/trace/submission/types/workspace_run_details.py index f67ecf68b..19e8bd482 100644 --- a/seed/fastapi/trace/resources/submission/types/workspace_run_details.py +++ b/seed/fastapi/trace/submission/types/workspace_run_details.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .exception_info import ExceptionInfo from .exception_v_2 import ExceptionV2 diff --git a/seed/fastapi/trace/resources/submission/types/workspace_starter_files_response.py b/seed/fastapi/trace/submission/types/workspace_starter_files_response.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/workspace_starter_files_response.py rename to seed/fastapi/trace/submission/types/workspace_starter_files_response.py index c5393b127..140c6d9d0 100644 --- a/seed/fastapi/trace/resources/submission/types/workspace_starter_files_response.py +++ b/seed/fastapi/trace/submission/types/workspace_starter_files_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.language import Language +from ...core.datetime_utils import serialize_datetime from .workspace_files import WorkspaceFiles try: diff --git a/seed/fastapi/trace/resources/submission/types/workspace_starter_files_response_v_2.py b/seed/fastapi/trace/submission/types/workspace_starter_files_response_v_2.py similarity index 90% rename from seed/fastapi/trace/resources/submission/types/workspace_starter_files_response_v_2.py rename to seed/fastapi/trace/submission/types/workspace_starter_files_response_v_2.py index 9e07bcf78..c576e5324 100644 --- a/seed/fastapi/trace/resources/submission/types/workspace_starter_files_response_v_2.py +++ b/seed/fastapi/trace/submission/types/workspace_starter_files_response_v_2.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.language import Language -from ...v_2.resources.problem.types.files import Files +from ...core.datetime_utils import serialize_datetime +from ...v_2.problem.types.files import Files try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/submission/types/workspace_submission_state.py b/seed/fastapi/trace/submission/types/workspace_submission_state.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/workspace_submission_state.py rename to seed/fastapi/trace/submission/types/workspace_submission_state.py index c3cc172cb..df8816702 100644 --- a/seed/fastapi/trace/resources/submission/types/workspace_submission_state.py +++ b/seed/fastapi/trace/submission/types/workspace_submission_state.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .workspace_submission_status import WorkspaceSubmissionStatus try: diff --git a/seed/fastapi/trace/resources/submission/types/workspace_submission_status.py b/seed/fastapi/trace/submission/types/workspace_submission_status.py similarity index 98% rename from seed/fastapi/trace/resources/submission/types/workspace_submission_status.py rename to seed/fastapi/trace/submission/types/workspace_submission_status.py index ecde16089..ca315f009 100644 --- a/seed/fastapi/trace/resources/submission/types/workspace_submission_status.py +++ b/seed/fastapi/trace/submission/types/workspace_submission_status.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .error_info import ErrorInfo from .running_submission_state import RunningSubmissionState from .workspace_run_details import WorkspaceRunDetails diff --git a/seed/fastapi/trace/resources/submission/types/workspace_submission_status_v_2.py b/seed/fastapi/trace/submission/types/workspace_submission_status_v_2.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/workspace_submission_status_v_2.py rename to seed/fastapi/trace/submission/types/workspace_submission_status_v_2.py index 5baa2e1de..e84c084f4 100644 --- a/seed/fastapi/trace/resources/submission/types/workspace_submission_status_v_2.py +++ b/seed/fastapi/trace/submission/types/workspace_submission_status_v_2.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .workspace_submission_update import WorkspaceSubmissionUpdate try: diff --git a/seed/fastapi/trace/resources/submission/types/workspace_submission_update.py b/seed/fastapi/trace/submission/types/workspace_submission_update.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/workspace_submission_update.py rename to seed/fastapi/trace/submission/types/workspace_submission_update.py index 9f8aea75b..16f30307e 100644 --- a/seed/fastapi/trace/resources/submission/types/workspace_submission_update.py +++ b/seed/fastapi/trace/submission/types/workspace_submission_update.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .workspace_submission_update_info import WorkspaceSubmissionUpdateInfo try: diff --git a/seed/fastapi/trace/resources/submission/types/workspace_submission_update_info.py b/seed/fastapi/trace/submission/types/workspace_submission_update_info.py similarity index 99% rename from seed/fastapi/trace/resources/submission/types/workspace_submission_update_info.py rename to seed/fastapi/trace/submission/types/workspace_submission_update_info.py index c06314dd3..9b33a7911 100644 --- a/seed/fastapi/trace/resources/submission/types/workspace_submission_update_info.py +++ b/seed/fastapi/trace/submission/types/workspace_submission_update_info.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .error_info import ErrorInfo from .running_submission_state import RunningSubmissionState from .workspace_run_details import WorkspaceRunDetails diff --git a/seed/fastapi/trace/resources/submission/types/workspace_submit_request.py b/seed/fastapi/trace/submission/types/workspace_submit_request.py similarity index 95% rename from seed/fastapi/trace/resources/submission/types/workspace_submit_request.py rename to seed/fastapi/trace/submission/types/workspace_submit_request.py index 698e7c9af..11ae3e689 100644 --- a/seed/fastapi/trace/resources/submission/types/workspace_submit_request.py +++ b/seed/fastapi/trace/submission/types/workspace_submit_request.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime from ...commons.types.language import Language +from ...core.datetime_utils import serialize_datetime from .submission_file_info import SubmissionFileInfo from .submission_id import SubmissionId diff --git a/seed/fastapi/trace/resources/submission/types/workspace_traced_update.py b/seed/fastapi/trace/submission/types/workspace_traced_update.py similarity index 94% rename from seed/fastapi/trace/resources/submission/types/workspace_traced_update.py rename to seed/fastapi/trace/submission/types/workspace_traced_update.py index 07d0ccbcd..679f8bba7 100644 --- a/seed/fastapi/trace/resources/submission/types/workspace_traced_update.py +++ b/seed/fastapi/trace/submission/types/workspace_traced_update.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/sysprop/__init__.py b/seed/fastapi/trace/sysprop/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/sysprop/__init__.py rename to seed/fastapi/trace/sysprop/__init__.py diff --git a/seed/fastapi/trace/resources/sysprop/service/__init__.py b/seed/fastapi/trace/sysprop/service/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/sysprop/service/__init__.py rename to seed/fastapi/trace/sysprop/service/__init__.py diff --git a/seed/fastapi/trace/resources/sysprop/service/service.py b/seed/fastapi/trace/sysprop/service/service.py similarity index 96% rename from seed/fastapi/trace/resources/sysprop/service/service.py rename to seed/fastapi/trace/sysprop/service/service.py index 4c65874a7..af3fe6b0e 100644 --- a/seed/fastapi/trace/resources/sysprop/service/service.py +++ b/seed/fastapi/trace/sysprop/service/service.py @@ -9,10 +9,10 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args from ...commons.types.language import Language +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args class AbstractSyspropService(AbstractFernService): diff --git a/seed/fastapi/trace/resources/v_2/resources/__init__.py b/seed/fastapi/trace/v_2/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/v_2/resources/__init__.py rename to seed/fastapi/trace/v_2/__init__.py diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/__init__.py b/seed/fastapi/trace/v_2/problem/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/v_2/resources/problem/__init__.py rename to seed/fastapi/trace/v_2/problem/__init__.py diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/service/__init__.py b/seed/fastapi/trace/v_2/problem/service/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/v_2/resources/problem/service/__init__.py rename to seed/fastapi/trace/v_2/problem/service/__init__.py diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/service/service.py b/seed/fastapi/trace/v_2/problem/service/service.py similarity index 98% rename from seed/fastapi/trace/resources/v_2/resources/problem/service/service.py rename to seed/fastapi/trace/v_2/problem/service/service.py index d5d130177..11faa5b3a 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/service/service.py +++ b/seed/fastapi/trace/v_2/problem/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ......core.abstract_fern_service import AbstractFernService -from ......core.exceptions.fern_http_exception import FernHTTPException -from ......core.route_args import get_route_args +from ....core.abstract_fern_service import AbstractFernService +from ....core.exceptions.fern_http_exception import FernHTTPException +from ....core.route_args import get_route_args from ..types.lightweight_problem_info_v_2 import LightweightProblemInfoV2 from ..types.problem_info_v_2 import ProblemInfoV2 diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/__init__.py b/seed/fastapi/trace/v_2/problem/types/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/__init__.py rename to seed/fastapi/trace/v_2/problem/types/__init__.py diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/assert_correctness_check.py b/seed/fastapi/trace/v_2/problem/types/assert_correctness_check.py similarity index 98% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/assert_correctness_check.py rename to seed/fastapi/trace/v_2/problem/types/assert_correctness_check.py index 506f9f10b..c84330c63 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/assert_correctness_check.py +++ b/seed/fastapi/trace/v_2/problem/types/assert_correctness_check.py @@ -7,7 +7,7 @@ import typing_extensions -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .deep_equality_correctness_check import DeepEqualityCorrectnessCheck from .void_function_definition_that_takes_actual_result import VoidFunctionDefinitionThatTakesActualResult diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/basic_custom_files.py b/seed/fastapi/trace/v_2/problem/types/basic_custom_files.py similarity index 92% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/basic_custom_files.py rename to seed/fastapi/trace/v_2/problem/types/basic_custom_files.py index 7380d947d..94edad908 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/basic_custom_files.py +++ b/seed/fastapi/trace/v_2/problem/types/basic_custom_files.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.language import Language +from ....commons.types.language import Language +from ....core.datetime_utils import serialize_datetime from .basic_test_case_template import BasicTestCaseTemplate from .files import Files from .non_void_function_signature import NonVoidFunctionSignature diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/basic_test_case_template.py b/seed/fastapi/trace/v_2/problem/types/basic_test_case_template.py similarity index 95% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/basic_test_case_template.py rename to seed/fastapi/trace/v_2/problem/types/basic_test_case_template.py index e1707cebe..1f41f9460 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/basic_test_case_template.py +++ b/seed/fastapi/trace/v_2/problem/types/basic_test_case_template.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .parameter_id import ParameterId from .test_case_implementation_description import TestCaseImplementationDescription from .test_case_template_id import TestCaseTemplateId diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/create_problem_request_v_2.py b/seed/fastapi/trace/v_2/problem/types/create_problem_request_v_2.py similarity index 89% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/create_problem_request_v_2.py rename to seed/fastapi/trace/v_2/problem/types/create_problem_request_v_2.py index ab24d3898..21725bb52 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/create_problem_request_v_2.py +++ b/seed/fastapi/trace/v_2/problem/types/create_problem_request_v_2.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.language import Language -from .......problem.types.problem_description import ProblemDescription +from ....commons.types.language import Language +from ....core.datetime_utils import serialize_datetime +from ....problem.types.problem_description import ProblemDescription from .custom_files import CustomFiles from .test_case_template import TestCaseTemplate from .test_case_v_2 import TestCaseV2 diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/custom_files.py b/seed/fastapi/trace/v_2/problem/types/custom_files.py similarity index 95% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/custom_files.py rename to seed/fastapi/trace/v_2/problem/types/custom_files.py index da6645712..0520537cf 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/custom_files.py +++ b/seed/fastapi/trace/v_2/problem/types/custom_files.py @@ -7,8 +7,8 @@ import typing_extensions -from ........core.datetime_utils import serialize_datetime -from .......commons.types.language import Language +from ....commons.types.language import Language +from ....core.datetime_utils import serialize_datetime from .basic_custom_files import BasicCustomFiles from .files import Files diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/deep_equality_correctness_check.py b/seed/fastapi/trace/v_2/problem/types/deep_equality_correctness_check.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/deep_equality_correctness_check.py rename to seed/fastapi/trace/v_2/problem/types/deep_equality_correctness_check.py index 193eef7c9..410e215ce 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/deep_equality_correctness_check.py +++ b/seed/fastapi/trace/v_2/problem/types/deep_equality_correctness_check.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .parameter_id import ParameterId try: diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/default_provided_file.py b/seed/fastapi/trace/v_2/problem/types/default_provided_file.py similarity index 89% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/default_provided_file.py rename to seed/fastapi/trace/v_2/problem/types/default_provided_file.py index 315db3cba..49c996d9e 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/default_provided_file.py +++ b/seed/fastapi/trace/v_2/problem/types/default_provided_file.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.variable_type import VariableType +from ....commons.types.variable_type import VariableType +from ....core.datetime_utils import serialize_datetime from .file_info_v_2 import FileInfoV2 try: diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/file_info_v_2.py b/seed/fastapi/trace/v_2/problem/types/file_info_v_2.py similarity index 93% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/file_info_v_2.py rename to seed/fastapi/trace/v_2/problem/types/file_info_v_2.py index cef846c1f..d440a3c71 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/file_info_v_2.py +++ b/seed/fastapi/trace/v_2/problem/types/file_info_v_2.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/files.py b/seed/fastapi/trace/v_2/problem/types/files.py similarity index 93% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/files.py rename to seed/fastapi/trace/v_2/problem/types/files.py index 79f8d3a3f..23f54413f 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/files.py +++ b/seed/fastapi/trace/v_2/problem/types/files.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .file_info_v_2 import FileInfoV2 try: diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/function_implementation.py b/seed/fastapi/trace/v_2/problem/types/function_implementation.py similarity index 93% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/function_implementation.py rename to seed/fastapi/trace/v_2/problem/types/function_implementation.py index 117a1c8e5..fbf42fbec 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/function_implementation.py +++ b/seed/fastapi/trace/v_2/problem/types/function_implementation.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/function_implementation_for_multiple_languages.py b/seed/fastapi/trace/v_2/problem/types/function_implementation_for_multiple_languages.py similarity index 90% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/function_implementation_for_multiple_languages.py rename to seed/fastapi/trace/v_2/problem/types/function_implementation_for_multiple_languages.py index 199b88952..16ffd5edc 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/function_implementation_for_multiple_languages.py +++ b/seed/fastapi/trace/v_2/problem/types/function_implementation_for_multiple_languages.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.language import Language +from ....commons.types.language import Language +from ....core.datetime_utils import serialize_datetime from .function_implementation import FunctionImplementation try: diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/function_signature.py b/seed/fastapi/trace/v_2/problem/types/function_signature.py similarity index 98% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/function_signature.py rename to seed/fastapi/trace/v_2/problem/types/function_signature.py index 32c8730be..90a6195ad 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/function_signature.py +++ b/seed/fastapi/trace/v_2/problem/types/function_signature.py @@ -7,7 +7,7 @@ import typing_extensions -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .non_void_function_signature import NonVoidFunctionSignature from .void_function_signature import VoidFunctionSignature from .void_function_signature_that_takes_actual_result import VoidFunctionSignatureThatTakesActualResult diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/generated_files.py b/seed/fastapi/trace/v_2/problem/types/generated_files.py similarity index 91% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/generated_files.py rename to seed/fastapi/trace/v_2/problem/types/generated_files.py index 64c9c1e54..8dbf809da 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/generated_files.py +++ b/seed/fastapi/trace/v_2/problem/types/generated_files.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.language import Language +from ....commons.types.language import Language +from ....core.datetime_utils import serialize_datetime from .files import Files try: diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/get_basic_solution_file_request.py b/seed/fastapi/trace/v_2/problem/types/get_basic_solution_file_request.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/get_basic_solution_file_request.py rename to seed/fastapi/trace/v_2/problem/types/get_basic_solution_file_request.py index 687169260..0ec70cd51 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/get_basic_solution_file_request.py +++ b/seed/fastapi/trace/v_2/problem/types/get_basic_solution_file_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .non_void_function_signature import NonVoidFunctionSignature try: diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_basic_solution_file_response.py b/seed/fastapi/trace/v_2/problem/types/get_basic_solution_file_response.py similarity index 90% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_basic_solution_file_response.py rename to seed/fastapi/trace/v_2/problem/types/get_basic_solution_file_response.py index 0c859ba2d..d3bd2e64f 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_basic_solution_file_response.py +++ b/seed/fastapi/trace/v_2/problem/types/get_basic_solution_file_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.language import Language +from ....commons.types.language import Language +from ....core.datetime_utils import serialize_datetime from .file_info_v_2 import FileInfoV2 try: diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/get_function_signature_request.py b/seed/fastapi/trace/v_2/problem/types/get_function_signature_request.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/get_function_signature_request.py rename to seed/fastapi/trace/v_2/problem/types/get_function_signature_request.py index b9980aa8c..56d8f8052 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/get_function_signature_request.py +++ b/seed/fastapi/trace/v_2/problem/types/get_function_signature_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .function_signature import FunctionSignature try: diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_function_signature_response.py b/seed/fastapi/trace/v_2/problem/types/get_function_signature_response.py similarity index 89% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_function_signature_response.py rename to seed/fastapi/trace/v_2/problem/types/get_function_signature_response.py index 33e15b310..7ba3acb50 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_function_signature_response.py +++ b/seed/fastapi/trace/v_2/problem/types/get_function_signature_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.language import Language +from ....commons.types.language import Language +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/get_generated_test_case_file_request.py b/seed/fastapi/trace/v_2/problem/types/get_generated_test_case_file_request.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/get_generated_test_case_file_request.py rename to seed/fastapi/trace/v_2/problem/types/get_generated_test_case_file_request.py index 0546a6dda..61fc49f00 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/get_generated_test_case_file_request.py +++ b/seed/fastapi/trace/v_2/problem/types/get_generated_test_case_file_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .test_case_template import TestCaseTemplate from .test_case_v_2 import TestCaseV2 diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/get_generated_test_case_template_file_request.py b/seed/fastapi/trace/v_2/problem/types/get_generated_test_case_template_file_request.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/get_generated_test_case_template_file_request.py rename to seed/fastapi/trace/v_2/problem/types/get_generated_test_case_template_file_request.py index c3c13fa27..bcd3c70ff 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/get_generated_test_case_template_file_request.py +++ b/seed/fastapi/trace/v_2/problem/types/get_generated_test_case_template_file_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .test_case_template import TestCaseTemplate try: diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/lightweight_problem_info_v_2.py b/seed/fastapi/trace/v_2/problem/types/lightweight_problem_info_v_2.py similarity index 86% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/lightweight_problem_info_v_2.py rename to seed/fastapi/trace/v_2/problem/types/lightweight_problem_info_v_2.py index 94bcedafb..80a849df2 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/lightweight_problem_info_v_2.py +++ b/seed/fastapi/trace/v_2/problem/types/lightweight_problem_info_v_2.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.problem_id import ProblemId -from .......commons.types.variable_type import VariableType +from ....commons.types.problem_id import ProblemId +from ....commons.types.variable_type import VariableType +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/non_void_function_definition.py b/seed/fastapi/trace/v_2/problem/types/non_void_function_definition.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/non_void_function_definition.py rename to seed/fastapi/trace/v_2/problem/types/non_void_function_definition.py index 3a39a6381..a542944b7 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/non_void_function_definition.py +++ b/seed/fastapi/trace/v_2/problem/types/non_void_function_definition.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .function_implementation_for_multiple_languages import FunctionImplementationForMultipleLanguages from .non_void_function_signature import NonVoidFunctionSignature diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/non_void_function_signature.py b/seed/fastapi/trace/v_2/problem/types/non_void_function_signature.py similarity index 89% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/non_void_function_signature.py rename to seed/fastapi/trace/v_2/problem/types/non_void_function_signature.py index 719402c3f..36f23c0c0 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/non_void_function_signature.py +++ b/seed/fastapi/trace/v_2/problem/types/non_void_function_signature.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.variable_type import VariableType +from ....commons.types.variable_type import VariableType +from ....core.datetime_utils import serialize_datetime from .parameter import Parameter try: diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/parameter.py b/seed/fastapi/trace/v_2/problem/types/parameter.py similarity index 89% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/parameter.py rename to seed/fastapi/trace/v_2/problem/types/parameter.py index 1e7523891..4171a34d4 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/parameter.py +++ b/seed/fastapi/trace/v_2/problem/types/parameter.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.variable_type import VariableType +from ....commons.types.variable_type import VariableType +from ....core.datetime_utils import serialize_datetime from .parameter_id import ParameterId try: diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/parameter_id.py b/seed/fastapi/trace/v_2/problem/types/parameter_id.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/parameter_id.py rename to seed/fastapi/trace/v_2/problem/types/parameter_id.py index b109603e6..46fcb34e6 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/parameter_id.py +++ b/seed/fastapi/trace/v_2/problem/types/parameter_id.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/problem_info_v_2.py b/seed/fastapi/trace/v_2/problem/types/problem_info_v_2.py similarity index 87% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/problem_info_v_2.py rename to seed/fastapi/trace/v_2/problem/types/problem_info_v_2.py index aac27eb3f..162d2c1f8 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/problem_info_v_2.py +++ b/seed/fastapi/trace/v_2/problem/types/problem_info_v_2.py @@ -3,10 +3,10 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.language import Language -from .......commons.types.problem_id import ProblemId -from .......problem.types.problem_description import ProblemDescription +from ....commons.types.language import Language +from ....commons.types.problem_id import ProblemId +from ....core.datetime_utils import serialize_datetime +from ....problem.types.problem_description import ProblemDescription from .custom_files import CustomFiles from .generated_files import GeneratedFiles from .test_case_template import TestCaseTemplate diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_expects.py b/seed/fastapi/trace/v_2/problem/types/test_case_expects.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_expects.py rename to seed/fastapi/trace/v_2/problem/types/test_case_expects.py index 5a6bdfb60..7f1ae573b 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_expects.py +++ b/seed/fastapi/trace/v_2/problem/types/test_case_expects.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_function.py b/seed/fastapi/trace/v_2/problem/types/test_case_function.py similarity index 98% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_function.py rename to seed/fastapi/trace/v_2/problem/types/test_case_function.py index 46c8edfe3..e12e6d0a5 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_function.py +++ b/seed/fastapi/trace/v_2/problem/types/test_case_function.py @@ -7,7 +7,7 @@ import typing_extensions -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .test_case_with_actual_result_implementation import TestCaseWithActualResultImplementation from .void_function_definition import VoidFunctionDefinition diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_id.py b/seed/fastapi/trace/v_2/problem/types/test_case_id.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_id.py rename to seed/fastapi/trace/v_2/problem/types/test_case_id.py index 3ddf6cf52..f6ac6c432 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_id.py +++ b/seed/fastapi/trace/v_2/problem/types/test_case_id.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_implementation.py b/seed/fastapi/trace/v_2/problem/types/test_case_implementation.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_implementation.py rename to seed/fastapi/trace/v_2/problem/types/test_case_implementation.py index a17de4a35..ad20b968b 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_implementation.py +++ b/seed/fastapi/trace/v_2/problem/types/test_case_implementation.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .test_case_function import TestCaseFunction from .test_case_implementation_description import TestCaseImplementationDescription diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_implementation_description.py b/seed/fastapi/trace/v_2/problem/types/test_case_implementation_description.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_implementation_description.py rename to seed/fastapi/trace/v_2/problem/types/test_case_implementation_description.py index 1c7900de4..8f500c90e 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_implementation_description.py +++ b/seed/fastapi/trace/v_2/problem/types/test_case_implementation_description.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .test_case_implementation_description_board import TestCaseImplementationDescriptionBoard try: diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_implementation_description_board.py b/seed/fastapi/trace/v_2/problem/types/test_case_implementation_description_board.py similarity index 97% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_implementation_description_board.py rename to seed/fastapi/trace/v_2/problem/types/test_case_implementation_description_board.py index c5a5fabd5..0a3b57ae5 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_implementation_description_board.py +++ b/seed/fastapi/trace/v_2/problem/types/test_case_implementation_description_board.py @@ -7,7 +7,7 @@ import typing_extensions -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .parameter_id import ParameterId try: diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_implementation_reference.py b/seed/fastapi/trace/v_2/problem/types/test_case_implementation_reference.py similarity index 98% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_implementation_reference.py rename to seed/fastapi/trace/v_2/problem/types/test_case_implementation_reference.py index 03edfbc6e..d397189ad 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_implementation_reference.py +++ b/seed/fastapi/trace/v_2/problem/types/test_case_implementation_reference.py @@ -7,7 +7,7 @@ import typing_extensions -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .test_case_implementation import TestCaseImplementation from .test_case_template_id import TestCaseTemplateId diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_metadata.py b/seed/fastapi/trace/v_2/problem/types/test_case_metadata.py similarity index 93% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_metadata.py rename to seed/fastapi/trace/v_2/problem/types/test_case_metadata.py index 17f221abc..2b9feb0d1 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_metadata.py +++ b/seed/fastapi/trace/v_2/problem/types/test_case_metadata.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .test_case_id import TestCaseId try: diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_template.py b/seed/fastapi/trace/v_2/problem/types/test_case_template.py similarity index 95% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_template.py rename to seed/fastapi/trace/v_2/problem/types/test_case_template.py index 961845b46..bff47a869 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_template.py +++ b/seed/fastapi/trace/v_2/problem/types/test_case_template.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .test_case_implementation import TestCaseImplementation from .test_case_template_id import TestCaseTemplateId diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_template_id.py b/seed/fastapi/trace/v_2/problem/types/test_case_template_id.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_template_id.py rename to seed/fastapi/trace/v_2/problem/types/test_case_template_id.py index c29858a97..17996551f 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_template_id.py +++ b/seed/fastapi/trace/v_2/problem/types/test_case_template_id.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_v_2.py b/seed/fastapi/trace/v_2/problem/types/test_case_v_2.py similarity index 90% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_v_2.py rename to seed/fastapi/trace/v_2/problem/types/test_case_v_2.py index 7a87ff726..861bfe23f 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_v_2.py +++ b/seed/fastapi/trace/v_2/problem/types/test_case_v_2.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.variable_value import VariableValue +from ....commons.types.variable_value import VariableValue +from ....core.datetime_utils import serialize_datetime from .parameter_id import ParameterId from .test_case_expects import TestCaseExpects from .test_case_implementation_reference import TestCaseImplementationReference diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_with_actual_result_implementation.py b/seed/fastapi/trace/v_2/problem/types/test_case_with_actual_result_implementation.py similarity index 95% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_with_actual_result_implementation.py rename to seed/fastapi/trace/v_2/problem/types/test_case_with_actual_result_implementation.py index 11817c2d3..8f908cdb7 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_with_actual_result_implementation.py +++ b/seed/fastapi/trace/v_2/problem/types/test_case_with_actual_result_implementation.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .assert_correctness_check import AssertCorrectnessCheck from .non_void_function_definition import NonVoidFunctionDefinition diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/void_function_definition.py b/seed/fastapi/trace/v_2/problem/types/void_function_definition.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/void_function_definition.py rename to seed/fastapi/trace/v_2/problem/types/void_function_definition.py index dce183fc8..0bd9cda6f 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/void_function_definition.py +++ b/seed/fastapi/trace/v_2/problem/types/void_function_definition.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .function_implementation_for_multiple_languages import FunctionImplementationForMultipleLanguages from .parameter import Parameter diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/void_function_definition_that_takes_actual_result.py b/seed/fastapi/trace/v_2/problem/types/void_function_definition_that_takes_actual_result.py similarity index 95% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/void_function_definition_that_takes_actual_result.py rename to seed/fastapi/trace/v_2/problem/types/void_function_definition_that_takes_actual_result.py index f316efef5..6fcf9c1ad 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/void_function_definition_that_takes_actual_result.py +++ b/seed/fastapi/trace/v_2/problem/types/void_function_definition_that_takes_actual_result.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .function_implementation_for_multiple_languages import FunctionImplementationForMultipleLanguages from .parameter import Parameter diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/void_function_signature.py b/seed/fastapi/trace/v_2/problem/types/void_function_signature.py similarity index 93% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/void_function_signature.py rename to seed/fastapi/trace/v_2/problem/types/void_function_signature.py index db762af72..0c1a21f27 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/void_function_signature.py +++ b/seed/fastapi/trace/v_2/problem/types/void_function_signature.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .parameter import Parameter try: diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/void_function_signature_that_takes_actual_result.py b/seed/fastapi/trace/v_2/problem/types/void_function_signature_that_takes_actual_result.py similarity index 89% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/void_function_signature_that_takes_actual_result.py rename to seed/fastapi/trace/v_2/problem/types/void_function_signature_that_takes_actual_result.py index 7ddbf98b6..3e3e0a2a2 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/void_function_signature_that_takes_actual_result.py +++ b/seed/fastapi/trace/v_2/problem/types/void_function_signature_that_takes_actual_result.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.variable_type import VariableType +from ....commons.types.variable_type import VariableType +from ....core.datetime_utils import serialize_datetime from .parameter import Parameter try: diff --git a/seed/fastapi/trace/resources/v_2/service/__init__.py b/seed/fastapi/trace/v_2/service/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/v_2/service/__init__.py rename to seed/fastapi/trace/v_2/service/__init__.py diff --git a/seed/fastapi/trace/resources/v_2/service/service.py b/seed/fastapi/trace/v_2/service/service.py similarity index 93% rename from seed/fastapi/trace/resources/v_2/service/service.py rename to seed/fastapi/trace/v_2/service/service.py index 8d2e2e529..cf5d3cf63 100644 --- a/seed/fastapi/trace/resources/v_2/service/service.py +++ b/seed/fastapi/trace/v_2/service/service.py @@ -9,9 +9,9 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args class AbstractV2Service(AbstractFernService): diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/__init__.py b/seed/fastapi/trace/v_2/v_3/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/__init__.py rename to seed/fastapi/trace/v_2/v_3/__init__.py diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/__init__.py b/seed/fastapi/trace/v_2/v_3/problem/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/__init__.py rename to seed/fastapi/trace/v_2/v_3/problem/__init__.py diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/service/__init__.py b/seed/fastapi/trace/v_2/v_3/problem/service/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/service/__init__.py rename to seed/fastapi/trace/v_2/v_3/problem/service/__init__.py diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/service/service.py b/seed/fastapi/trace/v_2/v_3/problem/service/service.py similarity index 98% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/service/service.py rename to seed/fastapi/trace/v_2/v_3/problem/service/service.py index 386c85e66..5fbbc3e9e 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/service/service.py +++ b/seed/fastapi/trace/v_2/v_3/problem/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ........core.abstract_fern_service import AbstractFernService -from ........core.exceptions.fern_http_exception import FernHTTPException -from ........core.route_args import get_route_args +from .....core.abstract_fern_service import AbstractFernService +from .....core.exceptions.fern_http_exception import FernHTTPException +from .....core.route_args import get_route_args from ..types.lightweight_problem_info_v_2 import LightweightProblemInfoV2 from ..types.problem_info_v_2 import ProblemInfoV2 diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/__init__.py b/seed/fastapi/trace/v_2/v_3/problem/types/__init__.py similarity index 100% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/__init__.py rename to seed/fastapi/trace/v_2/v_3/problem/types/__init__.py diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/assert_correctness_check.py b/seed/fastapi/trace/v_2/v_3/problem/types/assert_correctness_check.py similarity index 98% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/assert_correctness_check.py rename to seed/fastapi/trace/v_2/v_3/problem/types/assert_correctness_check.py index 22cc71a27..d7be369b0 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/assert_correctness_check.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/assert_correctness_check.py @@ -7,7 +7,7 @@ import typing_extensions -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .deep_equality_correctness_check import DeepEqualityCorrectnessCheck from .void_function_definition_that_takes_actual_result import VoidFunctionDefinitionThatTakesActualResult diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/basic_custom_files.py b/seed/fastapi/trace/v_2/v_3/problem/types/basic_custom_files.py similarity index 95% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/basic_custom_files.py rename to seed/fastapi/trace/v_2/v_3/problem/types/basic_custom_files.py index 61f52c8a0..c843cdf9c 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/basic_custom_files.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/basic_custom_files.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime from .....commons.types.language import Language +from .....core.datetime_utils import serialize_datetime from .basic_test_case_template import BasicTestCaseTemplate from .files import Files from .non_void_function_signature import NonVoidFunctionSignature diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/basic_test_case_template.py b/seed/fastapi/trace/v_2/v_3/problem/types/basic_test_case_template.py similarity index 95% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/basic_test_case_template.py rename to seed/fastapi/trace/v_2/v_3/problem/types/basic_test_case_template.py index 35ad3cd94..1a585e8fc 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/basic_test_case_template.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/basic_test_case_template.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .parameter_id import ParameterId from .test_case_implementation_description import TestCaseImplementationDescription from .test_case_template_id import TestCaseTemplateId diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/create_problem_request_v_2.py b/seed/fastapi/trace/v_2/v_3/problem/types/create_problem_request_v_2.py similarity index 96% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/create_problem_request_v_2.py rename to seed/fastapi/trace/v_2/v_3/problem/types/create_problem_request_v_2.py index 80c05e321..ede8824fd 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/create_problem_request_v_2.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/create_problem_request_v_2.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime from .....commons.types.language import Language +from .....core.datetime_utils import serialize_datetime from .....problem.types.problem_description import ProblemDescription from .custom_files import CustomFiles from .test_case_template import TestCaseTemplate diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/custom_files.py b/seed/fastapi/trace/v_2/v_3/problem/types/custom_files.py similarity index 97% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/custom_files.py rename to seed/fastapi/trace/v_2/v_3/problem/types/custom_files.py index 1154887f2..b518bcdb6 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/custom_files.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/custom_files.py @@ -7,8 +7,8 @@ import typing_extensions -from ......core.datetime_utils import serialize_datetime from .....commons.types.language import Language +from .....core.datetime_utils import serialize_datetime from .basic_custom_files import BasicCustomFiles from .files import Files diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/deep_equality_correctness_check.py b/seed/fastapi/trace/v_2/v_3/problem/types/deep_equality_correctness_check.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/deep_equality_correctness_check.py rename to seed/fastapi/trace/v_2/v_3/problem/types/deep_equality_correctness_check.py index e7da7a143..79be52f6c 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/deep_equality_correctness_check.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/deep_equality_correctness_check.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .parameter_id import ParameterId try: diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/default_provided_file.py b/seed/fastapi/trace/v_2/v_3/problem/types/default_provided_file.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/default_provided_file.py rename to seed/fastapi/trace/v_2/v_3/problem/types/default_provided_file.py index ad662d31d..fe956d502 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/default_provided_file.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/default_provided_file.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime from .....commons.types.variable_type import VariableType +from .....core.datetime_utils import serialize_datetime from .file_info_v_2 import FileInfoV2 try: diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/file_info_v_2.py b/seed/fastapi/trace/v_2/v_3/problem/types/file_info_v_2.py similarity index 93% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/file_info_v_2.py rename to seed/fastapi/trace/v_2/v_3/problem/types/file_info_v_2.py index 0bbef56a4..84737d55a 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/file_info_v_2.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/file_info_v_2.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/files.py b/seed/fastapi/trace/v_2/v_3/problem/types/files.py similarity index 93% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/files.py rename to seed/fastapi/trace/v_2/v_3/problem/types/files.py index f533d7e04..93d0e726f 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/files.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/files.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .file_info_v_2 import FileInfoV2 try: diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/function_implementation.py b/seed/fastapi/trace/v_2/v_3/problem/types/function_implementation.py similarity index 93% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/function_implementation.py rename to seed/fastapi/trace/v_2/v_3/problem/types/function_implementation.py index 8e3d1f64f..5264c6cdf 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/function_implementation.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/function_implementation.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/function_implementation_for_multiple_languages.py b/seed/fastapi/trace/v_2/v_3/problem/types/function_implementation_for_multiple_languages.py similarity index 95% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/function_implementation_for_multiple_languages.py rename to seed/fastapi/trace/v_2/v_3/problem/types/function_implementation_for_multiple_languages.py index d496f24b9..eb7ca29f2 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/function_implementation_for_multiple_languages.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/function_implementation_for_multiple_languages.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime from .....commons.types.language import Language +from .....core.datetime_utils import serialize_datetime from .function_implementation import FunctionImplementation try: diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/function_signature.py b/seed/fastapi/trace/v_2/v_3/problem/types/function_signature.py similarity index 98% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/function_signature.py rename to seed/fastapi/trace/v_2/v_3/problem/types/function_signature.py index 849476554..5cfd9e520 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/function_signature.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/function_signature.py @@ -7,7 +7,7 @@ import typing_extensions -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .non_void_function_signature import NonVoidFunctionSignature from .void_function_signature import VoidFunctionSignature from .void_function_signature_that_takes_actual_result import VoidFunctionSignatureThatTakesActualResult diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/generated_files.py b/seed/fastapi/trace/v_2/v_3/problem/types/generated_files.py similarity index 95% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/generated_files.py rename to seed/fastapi/trace/v_2/v_3/problem/types/generated_files.py index 85778ec6f..7dbd61ad9 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/generated_files.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/generated_files.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime from .....commons.types.language import Language +from .....core.datetime_utils import serialize_datetime from .files import Files try: diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_basic_solution_file_request.py b/seed/fastapi/trace/v_2/v_3/problem/types/get_basic_solution_file_request.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_basic_solution_file_request.py rename to seed/fastapi/trace/v_2/v_3/problem/types/get_basic_solution_file_request.py index 4ef164f0f..31e7354c5 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_basic_solution_file_request.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/get_basic_solution_file_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .non_void_function_signature import NonVoidFunctionSignature try: diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/get_basic_solution_file_response.py b/seed/fastapi/trace/v_2/v_3/problem/types/get_basic_solution_file_response.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/get_basic_solution_file_response.py rename to seed/fastapi/trace/v_2/v_3/problem/types/get_basic_solution_file_response.py index e11894ba9..4b3d47bcc 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/get_basic_solution_file_response.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/get_basic_solution_file_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime from .....commons.types.language import Language +from .....core.datetime_utils import serialize_datetime from .file_info_v_2 import FileInfoV2 try: diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_function_signature_request.py b/seed/fastapi/trace/v_2/v_3/problem/types/get_function_signature_request.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_function_signature_request.py rename to seed/fastapi/trace/v_2/v_3/problem/types/get_function_signature_request.py index 6b0213841..261e7e11e 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_function_signature_request.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/get_function_signature_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .function_signature import FunctionSignature try: diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/get_function_signature_response.py b/seed/fastapi/trace/v_2/v_3/problem/types/get_function_signature_response.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/get_function_signature_response.py rename to seed/fastapi/trace/v_2/v_3/problem/types/get_function_signature_response.py index 8830a9494..ba4d8a98d 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/get_function_signature_response.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/get_function_signature_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime from .....commons.types.language import Language +from .....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_generated_test_case_file_request.py b/seed/fastapi/trace/v_2/v_3/problem/types/get_generated_test_case_file_request.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_generated_test_case_file_request.py rename to seed/fastapi/trace/v_2/v_3/problem/types/get_generated_test_case_file_request.py index d362015d7..eadd2b9e4 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_generated_test_case_file_request.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/get_generated_test_case_file_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .test_case_template import TestCaseTemplate from .test_case_v_2 import TestCaseV2 diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_generated_test_case_template_file_request.py b/seed/fastapi/trace/v_2/v_3/problem/types/get_generated_test_case_template_file_request.py similarity index 93% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_generated_test_case_template_file_request.py rename to seed/fastapi/trace/v_2/v_3/problem/types/get_generated_test_case_template_file_request.py index d091279d3..74aea1cbd 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/get_generated_test_case_template_file_request.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/get_generated_test_case_template_file_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .test_case_template import TestCaseTemplate try: diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/lightweight_problem_info_v_2.py b/seed/fastapi/trace/v_2/v_3/problem/types/lightweight_problem_info_v_2.py similarity index 95% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/lightweight_problem_info_v_2.py rename to seed/fastapi/trace/v_2/v_3/problem/types/lightweight_problem_info_v_2.py index 3cc692b97..d40f32c9a 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/lightweight_problem_info_v_2.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/lightweight_problem_info_v_2.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime from .....commons.types.problem_id import ProblemId from .....commons.types.variable_type import VariableType +from .....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/non_void_function_definition.py b/seed/fastapi/trace/v_2/v_3/problem/types/non_void_function_definition.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/non_void_function_definition.py rename to seed/fastapi/trace/v_2/v_3/problem/types/non_void_function_definition.py index b625dfa54..400e15c9f 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/non_void_function_definition.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/non_void_function_definition.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .function_implementation_for_multiple_languages import FunctionImplementationForMultipleLanguages from .non_void_function_signature import NonVoidFunctionSignature diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/non_void_function_signature.py b/seed/fastapi/trace/v_2/v_3/problem/types/non_void_function_signature.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/non_void_function_signature.py rename to seed/fastapi/trace/v_2/v_3/problem/types/non_void_function_signature.py index 13edf161e..12cd7e4e9 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/non_void_function_signature.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/non_void_function_signature.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime from .....commons.types.variable_type import VariableType +from .....core.datetime_utils import serialize_datetime from .parameter import Parameter try: diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/parameter.py b/seed/fastapi/trace/v_2/v_3/problem/types/parameter.py similarity index 95% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/parameter.py rename to seed/fastapi/trace/v_2/v_3/problem/types/parameter.py index d672f3d45..0038fef33 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/parameter.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/parameter.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime from .....commons.types.variable_type import VariableType +from .....core.datetime_utils import serialize_datetime from .parameter_id import ParameterId try: diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/parameter_id.py b/seed/fastapi/trace/v_2/v_3/problem/types/parameter_id.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/parameter_id.py rename to seed/fastapi/trace/v_2/v_3/problem/types/parameter_id.py index 6b608e442..9a9e9ab32 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/parameter_id.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/parameter_id.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/problem_info_v_2.py b/seed/fastapi/trace/v_2/v_3/problem/types/problem_info_v_2.py similarity index 97% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/problem_info_v_2.py rename to seed/fastapi/trace/v_2/v_3/problem/types/problem_info_v_2.py index ac29a0f6d..5f32a3687 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/problem_info_v_2.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/problem_info_v_2.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime from .....commons.types.language import Language from .....commons.types.problem_id import ProblemId +from .....core.datetime_utils import serialize_datetime from .....problem.types.problem_description import ProblemDescription from .custom_files import CustomFiles from .generated_files import GeneratedFiles diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_expects.py b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_expects.py similarity index 93% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_expects.py rename to seed/fastapi/trace/v_2/v_3/problem/types/test_case_expects.py index 86a27199c..8ddd51129 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_expects.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_expects.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_function.py b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_function.py similarity index 98% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_function.py rename to seed/fastapi/trace/v_2/v_3/problem/types/test_case_function.py index f302412e5..bc9b530a7 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_function.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_function.py @@ -7,7 +7,7 @@ import typing_extensions -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .test_case_with_actual_result_implementation import TestCaseWithActualResultImplementation from .void_function_definition import VoidFunctionDefinition diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_id.py b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_id.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_id.py rename to seed/fastapi/trace/v_2/v_3/problem/types/test_case_id.py index 19126b549..ecc9b9ace 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_id.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_id.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation.py b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_implementation.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation.py rename to seed/fastapi/trace/v_2/v_3/problem/types/test_case_implementation.py index c89a72714..c6334b30b 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_implementation.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .test_case_function import TestCaseFunction from .test_case_implementation_description import TestCaseImplementationDescription diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_description.py b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_implementation_description.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_description.py rename to seed/fastapi/trace/v_2/v_3/problem/types/test_case_implementation_description.py index 81989f683..c7719f266 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_description.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_implementation_description.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .test_case_implementation_description_board import TestCaseImplementationDescriptionBoard try: diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_description_board.py b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_implementation_description_board.py similarity index 97% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_description_board.py rename to seed/fastapi/trace/v_2/v_3/problem/types/test_case_implementation_description_board.py index 8f45fae29..027db3926 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_description_board.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_implementation_description_board.py @@ -7,7 +7,7 @@ import typing_extensions -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .parameter_id import ParameterId try: diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_reference.py b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_implementation_reference.py similarity index 98% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_reference.py rename to seed/fastapi/trace/v_2/v_3/problem/types/test_case_implementation_reference.py index 3c577f006..2699449b5 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_reference.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_implementation_reference.py @@ -7,7 +7,7 @@ import typing_extensions -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .test_case_implementation import TestCaseImplementation from .test_case_template_id import TestCaseTemplateId diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_metadata.py b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_metadata.py similarity index 93% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_metadata.py rename to seed/fastapi/trace/v_2/v_3/problem/types/test_case_metadata.py index 338b9e40c..a7b36c5b5 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_metadata.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_metadata.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .test_case_id import TestCaseId try: diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_template.py b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_template.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_template.py rename to seed/fastapi/trace/v_2/v_3/problem/types/test_case_template.py index dfe59b423..f8439e2f2 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_template.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_template.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .test_case_implementation import TestCaseImplementation from .test_case_template_id import TestCaseTemplateId diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_template_id.py b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_template_id.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_template_id.py rename to seed/fastapi/trace/v_2/v_3/problem/types/test_case_template_id.py index 1975dfe26..eadcbfee4 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_template_id.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_template_id.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_v_2.py b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_v_2.py similarity index 95% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_v_2.py rename to seed/fastapi/trace/v_2/v_3/problem/types/test_case_v_2.py index f42d63a05..881fb923e 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/test_case_v_2.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_v_2.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime from .....commons.types.variable_value import VariableValue +from .....core.datetime_utils import serialize_datetime from .parameter_id import ParameterId from .test_case_expects import TestCaseExpects from .test_case_implementation_reference import TestCaseImplementationReference diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_with_actual_result_implementation.py b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_with_actual_result_implementation.py similarity index 95% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_with_actual_result_implementation.py rename to seed/fastapi/trace/v_2/v_3/problem/types/test_case_with_actual_result_implementation.py index 67d46108c..e18790c93 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/test_case_with_actual_result_implementation.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/test_case_with_actual_result_implementation.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .assert_correctness_check import AssertCorrectnessCheck from .non_void_function_definition import NonVoidFunctionDefinition diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/void_function_definition.py b/seed/fastapi/trace/v_2/v_3/problem/types/void_function_definition.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/void_function_definition.py rename to seed/fastapi/trace/v_2/v_3/problem/types/void_function_definition.py index 30049e29c..266a4759a 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/void_function_definition.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/void_function_definition.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .function_implementation_for_multiple_languages import FunctionImplementationForMultipleLanguages from .parameter import Parameter diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/void_function_definition_that_takes_actual_result.py b/seed/fastapi/trace/v_2/v_3/problem/types/void_function_definition_that_takes_actual_result.py similarity index 95% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/void_function_definition_that_takes_actual_result.py rename to seed/fastapi/trace/v_2/v_3/problem/types/void_function_definition_that_takes_actual_result.py index 425160925..67f39fbf9 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/void_function_definition_that_takes_actual_result.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/void_function_definition_that_takes_actual_result.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .function_implementation_for_multiple_languages import FunctionImplementationForMultipleLanguages from .parameter import Parameter diff --git a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/void_function_signature.py b/seed/fastapi/trace/v_2/v_3/problem/types/void_function_signature.py similarity index 93% rename from seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/void_function_signature.py rename to seed/fastapi/trace/v_2/v_3/problem/types/void_function_signature.py index 3a2af3108..b695bfa8e 100644 --- a/seed/fastapi/trace/resources/v_2/resources/v_3/resources/problem/types/void_function_signature.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/void_function_signature.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from .....core.datetime_utils import serialize_datetime from .parameter import Parameter try: diff --git a/seed/fastapi/trace/resources/v_2/resources/problem/types/void_function_signature_that_takes_actual_result.py b/seed/fastapi/trace/v_2/v_3/problem/types/void_function_signature_that_takes_actual_result.py similarity index 94% rename from seed/fastapi/trace/resources/v_2/resources/problem/types/void_function_signature_that_takes_actual_result.py rename to seed/fastapi/trace/v_2/v_3/problem/types/void_function_signature_that_takes_actual_result.py index 7e70e4698..1d466dba8 100644 --- a/seed/fastapi/trace/resources/v_2/resources/problem/types/void_function_signature_that_takes_actual_result.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/void_function_signature_that_takes_actual_result.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime from .....commons.types.variable_type import VariableType +from .....core.datetime_utils import serialize_datetime from .parameter import Parameter try: diff --git a/seed/fastapi/undiscriminated-unions/__init__.py b/seed/fastapi/undiscriminated-unions/__init__.py index 4cc332245..40af3cb7c 100644 --- a/seed/fastapi/undiscriminated-unions/__init__.py +++ b/seed/fastapi/undiscriminated-unions/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import MyUnion, union +from . import union +from .union import MyUnion __all__ = ["MyUnion", "union"] diff --git a/seed/fastapi/undiscriminated-unions/register.py b/seed/fastapi/undiscriminated-unions/register.py index db436fe2b..25b546a82 100644 --- a/seed/fastapi/undiscriminated-unions/register.py +++ b/seed/fastapi/undiscriminated-unions/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.union.service.service import AbstractUnionService +from .union.service.service import AbstractUnionService def register( diff --git a/seed/fastapi/undiscriminated-unions/resources/__init__.py b/seed/fastapi/undiscriminated-unions/resources/__init__.py deleted file mode 100644 index 40af3cb7c..000000000 --- a/seed/fastapi/undiscriminated-unions/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import union -from .union import MyUnion - -__all__ = ["MyUnion", "union"] diff --git a/seed/fastapi/undiscriminated-unions/resources/union/__init__.py b/seed/fastapi/undiscriminated-unions/union/__init__.py similarity index 100% rename from seed/fastapi/undiscriminated-unions/resources/union/__init__.py rename to seed/fastapi/undiscriminated-unions/union/__init__.py diff --git a/seed/fastapi/undiscriminated-unions/resources/union/service/__init__.py b/seed/fastapi/undiscriminated-unions/union/service/__init__.py similarity index 100% rename from seed/fastapi/undiscriminated-unions/resources/union/service/__init__.py rename to seed/fastapi/undiscriminated-unions/union/service/__init__.py diff --git a/seed/fastapi/undiscriminated-unions/resources/union/service/service.py b/seed/fastapi/undiscriminated-unions/union/service/service.py similarity index 93% rename from seed/fastapi/undiscriminated-unions/resources/union/service/service.py rename to seed/fastapi/undiscriminated-unions/union/service/service.py index 5e91834a1..31c539a75 100644 --- a/seed/fastapi/undiscriminated-unions/resources/union/service/service.py +++ b/seed/fastapi/undiscriminated-unions/union/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args from ..types.my_union import MyUnion diff --git a/seed/fastapi/undiscriminated-unions/resources/union/types/__init__.py b/seed/fastapi/undiscriminated-unions/union/types/__init__.py similarity index 100% rename from seed/fastapi/undiscriminated-unions/resources/union/types/__init__.py rename to seed/fastapi/undiscriminated-unions/union/types/__init__.py diff --git a/seed/fastapi/undiscriminated-unions/resources/union/types/my_union.py b/seed/fastapi/undiscriminated-unions/union/types/my_union.py similarity index 100% rename from seed/fastapi/undiscriminated-unions/resources/union/types/my_union.py rename to seed/fastapi/undiscriminated-unions/union/types/my_union.py diff --git a/seed/fastapi/unknown/__init__.py b/seed/fastapi/unknown/__init__.py index faf4dfc14..78ba5bcd8 100644 --- a/seed/fastapi/unknown/__init__.py +++ b/seed/fastapi/unknown/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import MyAlias, MyObject, unknown +from . import unknown +from .unknown import MyAlias, MyObject __all__ = ["MyAlias", "MyObject", "unknown"] diff --git a/seed/fastapi/unknown/register.py b/seed/fastapi/unknown/register.py index 8315b1446..7b711cf7b 100644 --- a/seed/fastapi/unknown/register.py +++ b/seed/fastapi/unknown/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.unknown.service.service import AbstractUnknownService +from .unknown.service.service import AbstractUnknownService def register( diff --git a/seed/fastapi/unknown/resources/__init__.py b/seed/fastapi/unknown/resources/__init__.py deleted file mode 100644 index 78ba5bcd8..000000000 --- a/seed/fastapi/unknown/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import unknown -from .unknown import MyAlias, MyObject - -__all__ = ["MyAlias", "MyObject", "unknown"] diff --git a/seed/fastapi/unknown/resources/unknown/__init__.py b/seed/fastapi/unknown/unknown/__init__.py similarity index 100% rename from seed/fastapi/unknown/resources/unknown/__init__.py rename to seed/fastapi/unknown/unknown/__init__.py diff --git a/seed/fastapi/unknown/resources/unknown/service/__init__.py b/seed/fastapi/unknown/unknown/service/__init__.py similarity index 100% rename from seed/fastapi/unknown/resources/unknown/service/__init__.py rename to seed/fastapi/unknown/unknown/service/__init__.py diff --git a/seed/fastapi/unknown/resources/unknown/service/service.py b/seed/fastapi/unknown/unknown/service/service.py similarity index 93% rename from seed/fastapi/unknown/resources/unknown/service/service.py rename to seed/fastapi/unknown/unknown/service/service.py index 52674743c..78da2ce8c 100644 --- a/seed/fastapi/unknown/resources/unknown/service/service.py +++ b/seed/fastapi/unknown/unknown/service/service.py @@ -8,9 +8,9 @@ import fastapi -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args class AbstractUnknownService(AbstractFernService): diff --git a/seed/fastapi/unknown/resources/unknown/types/__init__.py b/seed/fastapi/unknown/unknown/types/__init__.py similarity index 100% rename from seed/fastapi/unknown/resources/unknown/types/__init__.py rename to seed/fastapi/unknown/unknown/types/__init__.py diff --git a/seed/fastapi/unknown/resources/unknown/types/my_alias.py b/seed/fastapi/unknown/unknown/types/my_alias.py similarity index 94% rename from seed/fastapi/unknown/resources/unknown/types/my_alias.py rename to seed/fastapi/unknown/unknown/types/my_alias.py index 989945595..a628b6534 100644 --- a/seed/fastapi/unknown/resources/unknown/types/my_alias.py +++ b/seed/fastapi/unknown/unknown/types/my_alias.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/unknown/resources/unknown/types/my_object.py b/seed/fastapi/unknown/unknown/types/my_object.py similarity index 93% rename from seed/fastapi/unknown/resources/unknown/types/my_object.py rename to seed/fastapi/unknown/unknown/types/my_object.py index 3b6c83dd1..5c4e6c54e 100644 --- a/seed/fastapi/unknown/resources/unknown/types/my_object.py +++ b/seed/fastapi/unknown/unknown/types/my_object.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/fastapi/variables/register.py b/seed/fastapi/variables/register.py index e0d14dcfb..98c6ce410 100644 --- a/seed/fastapi/variables/register.py +++ b/seed/fastapi/variables/register.py @@ -13,7 +13,7 @@ from .core.abstract_fern_service import AbstractFernService from .core.exceptions import default_exception_handler, fern_http_exception_handler, http_exception_handler from .core.exceptions.fern_http_exception import FernHTTPException -from .resources.service.service.service import AbstractServiceService +from .service.service.service import AbstractServiceService def register( diff --git a/seed/fastapi/variables/resources/service/__init__.py b/seed/fastapi/variables/service/__init__.py similarity index 100% rename from seed/fastapi/variables/resources/service/__init__.py rename to seed/fastapi/variables/service/__init__.py diff --git a/seed/fastapi/variables/resources/service/service/__init__.py b/seed/fastapi/variables/service/service/__init__.py similarity index 100% rename from seed/fastapi/variables/resources/service/service/__init__.py rename to seed/fastapi/variables/service/service/__init__.py diff --git a/seed/fastapi/variables/resources/service/service/service.py b/seed/fastapi/variables/service/service/service.py similarity index 93% rename from seed/fastapi/variables/resources/service/service/service.py rename to seed/fastapi/variables/service/service/service.py index 34fcb452f..1f3f95485 100644 --- a/seed/fastapi/variables/resources/service/service/service.py +++ b/seed/fastapi/variables/service/service/service.py @@ -9,9 +9,9 @@ import fastapi import starlette -from ....core.abstract_fern_service import AbstractFernService -from ....core.exceptions.fern_http_exception import FernHTTPException -from ....core.route_args import get_route_args +from ...core.abstract_fern_service import AbstractFernService +from ...core.exceptions.fern_http_exception import FernHTTPException +from ...core.route_args import get_route_args class AbstractServiceService(AbstractFernService): diff --git a/seed/pydantic/examples/src/seed/examples/resources/commons/resources/types/data.py b/seed/pydantic/examples/src/seed/examples/resources/commons/resources/types/data.py index 0f7198d52..1c881d490 100644 --- a/seed/pydantic/examples/src/seed/examples/resources/commons/resources/types/data.py +++ b/seed/pydantic/examples/src/seed/examples/resources/commons/resources/types/data.py @@ -23,7 +23,7 @@ class Data_Base64(pydantic.BaseModel): """ -from seed.examples.resources.commons import Data_String +from seed.examples.commons import Data_String Data_String(type="string", value="data") """ diff --git a/seed/pydantic/examples/src/seed/examples/resources/commons/resources/types/event_info.py b/seed/pydantic/examples/src/seed/examples/resources/commons/resources/types/event_info.py index ff1c6523c..ec0042d48 100644 --- a/seed/pydantic/examples/src/seed/examples/resources/commons/resources/types/event_info.py +++ b/seed/pydantic/examples/src/seed/examples/resources/commons/resources/types/event_info.py @@ -28,7 +28,7 @@ class EventInfo_Tag(pydantic.BaseModel): """ -from seed.examples.resources.commons import EventInfo_Metadata +from seed.examples.commons import EventInfo_Metadata EventInfo_Metadata( type="metadata", diff --git a/seed/pydantic/examples/src/seed/examples/resources/commons/resources/types/metadata.py b/seed/pydantic/examples/src/seed/examples/resources/commons/resources/types/metadata.py index d52205642..88c896bc3 100644 --- a/seed/pydantic/examples/src/seed/examples/resources/commons/resources/types/metadata.py +++ b/seed/pydantic/examples/src/seed/examples/resources/commons/resources/types/metadata.py @@ -13,7 +13,7 @@ class Metadata(pydantic.BaseModel): """ - from seed.examples.resources.commons import Metadata + from seed.examples.commons import Metadata Metadata( id="metadata-js8dg24b", diff --git a/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/node.py b/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/node.py index 042f2e9dd..d14c8a686 100644 --- a/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/node.py +++ b/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/node.py @@ -15,7 +15,7 @@ class Node(pydantic.BaseModel): """ from seed.objects_with_imports import Node - from seed.objects_with_imports.resources.commons import Metadata + from seed.objects_with_imports.commons import Metadata Node( id="node-8dvgfja2", diff --git a/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/resources/commons/resources/metadata/metadata.py b/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/resources/commons/resources/metadata/metadata.py index 25d63093e..79090042a 100644 --- a/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/resources/commons/resources/metadata/metadata.py +++ b/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/resources/commons/resources/metadata/metadata.py @@ -13,7 +13,7 @@ class Metadata(pydantic.BaseModel): """ - from seed.objects_with_imports.resources.commons import Metadata + from seed.objects_with_imports.commons import Metadata Metadata( id="metadata-js8dg24b", diff --git a/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/resources/file/resources/directory/directory.py b/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/resources/file/resources/directory/directory.py index fb1249d4e..32042b389 100644 --- a/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/resources/file/resources/directory/directory.py +++ b/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/resources/file/resources/directory/directory.py @@ -17,7 +17,7 @@ class Directory(pydantic.BaseModel): """ from seed.objects_with_imports import File, FileInfo - from seed.objects_with_imports.resources.file import Directory + from seed.objects_with_imports.file import Directory Directory( name="root", diff --git a/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/tree.py b/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/tree.py index f7b178dd4..2239f8f9d 100644 --- a/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/tree.py +++ b/seed/pydantic/objects-with-imports/src/seed/objects_with_imports/tree.py @@ -15,7 +15,7 @@ class Tree(pydantic.BaseModel): """ from seed.objects_with_imports import Node, Tree - from seed.objects_with_imports.resources.commons import Metadata + from seed.objects_with_imports.commons import Metadata Tree( nodes=[ diff --git a/seed/pydantic/optional/.github/workflows/ci.yml b/seed/pydantic/optional/.github/workflows/ci.yml new file mode 100644 index 000000000..e70067b9a --- /dev/null +++ b/seed/pydantic/optional/.github/workflows/ci.yml @@ -0,0 +1,36 @@ +name: ci + +on: [push] +jobs: + compile: + runs-on: ubuntu-20.04 + steps: + - name: Checkout repo + uses: actions/checkout@v3 + - name: Set up python + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: Bootstrap poetry + run: | + curl -sSL https://install.python-poetry.org | python - -y --version 1.5.1 + - name: Install dependencies + run: poetry install + - name: Compile + run: poetry run mypy . + test: + runs-on: ubuntu-20.04 + steps: + - name: Checkout repo + uses: actions/checkout@v3 + - name: Set up python + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: Bootstrap poetry + run: | + curl -sSL https://install.python-poetry.org | python - -y --version 1.5.1 + - name: Install dependencies + run: poetry install + - name: Test + run: poetry run pytest . diff --git a/seed/pydantic/optional/.gitignore b/seed/pydantic/optional/.gitignore new file mode 100644 index 000000000..42cb86350 --- /dev/null +++ b/seed/pydantic/optional/.gitignore @@ -0,0 +1,4 @@ +dist/ +.mypy_cache/ +__pycache__/ +poetry.toml diff --git a/seed/pydantic/optional/README.md b/seed/pydantic/optional/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/seed/pydantic/optional/poetry.lock b/seed/pydantic/optional/poetry.lock new file mode 100644 index 000000000..db85a99e3 --- /dev/null +++ b/seed/pydantic/optional/poetry.lock @@ -0,0 +1,255 @@ +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. + +[[package]] +name = "colorama" +version = "0.4.6" +description = "Cross-platform colored terminal text." +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" +files = [ + {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, + {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, +] + +[[package]] +name = "exceptiongroup" +version = "1.2.0" +description = "Backport of PEP 654 (exception groups)" +optional = false +python-versions = ">=3.7" +files = [ + {file = "exceptiongroup-1.2.0-py3-none-any.whl", hash = "sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14"}, + {file = "exceptiongroup-1.2.0.tar.gz", hash = "sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68"}, +] + +[package.extras] +test = ["pytest (>=6)"] + +[[package]] +name = "importlib-metadata" +version = "6.7.0" +description = "Read metadata from Python packages" +optional = false +python-versions = ">=3.7" +files = [ + {file = "importlib_metadata-6.7.0-py3-none-any.whl", hash = "sha256:cb52082e659e97afc5dac71e79de97d8681de3aa07ff18578330904a9d18e5b5"}, + {file = "importlib_metadata-6.7.0.tar.gz", hash = "sha256:1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4"}, +] + +[package.dependencies] +typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} +zipp = ">=0.5" + +[package.extras] +docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +perf = ["ipython"] +testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"] + +[[package]] +name = "iniconfig" +version = "2.0.0" +description = "brain-dead simple config-ini parsing" +optional = false +python-versions = ">=3.7" +files = [ + {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"}, + {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"}, +] + +[[package]] +name = "mypy" +version = "0.971" +description = "Optional static typing for Python" +optional = false +python-versions = ">=3.6" +files = [ + {file = "mypy-0.971-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:f2899a3cbd394da157194f913a931edfd4be5f274a88041c9dc2d9cdcb1c315c"}, + {file = "mypy-0.971-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:98e02d56ebe93981c41211c05adb630d1d26c14195d04d95e49cd97dbc046dc5"}, + {file = "mypy-0.971-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:19830b7dba7d5356d3e26e2427a2ec91c994cd92d983142cbd025ebe81d69cf3"}, + {file = "mypy-0.971-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:02ef476f6dcb86e6f502ae39a16b93285fef97e7f1ff22932b657d1ef1f28655"}, + {file = "mypy-0.971-cp310-cp310-win_amd64.whl", hash = "sha256:25c5750ba5609a0c7550b73a33deb314ecfb559c350bb050b655505e8aed4103"}, + {file = "mypy-0.971-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:d3348e7eb2eea2472db611486846742d5d52d1290576de99d59edeb7cd4a42ca"}, + {file = "mypy-0.971-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3fa7a477b9900be9b7dd4bab30a12759e5abe9586574ceb944bc29cddf8f0417"}, + {file = "mypy-0.971-cp36-cp36m-win_amd64.whl", hash = "sha256:2ad53cf9c3adc43cf3bea0a7d01a2f2e86db9fe7596dfecb4496a5dda63cbb09"}, + {file = "mypy-0.971-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:855048b6feb6dfe09d3353466004490b1872887150c5bb5caad7838b57328cc8"}, + {file = "mypy-0.971-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:23488a14a83bca6e54402c2e6435467a4138785df93ec85aeff64c6170077fb0"}, + {file = "mypy-0.971-cp37-cp37m-win_amd64.whl", hash = "sha256:4b21e5b1a70dfb972490035128f305c39bc4bc253f34e96a4adf9127cf943eb2"}, + {file = "mypy-0.971-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:9796a2ba7b4b538649caa5cecd398d873f4022ed2333ffde58eaf604c4d2cb27"}, + {file = "mypy-0.971-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:5a361d92635ad4ada1b1b2d3630fc2f53f2127d51cf2def9db83cba32e47c856"}, + {file = "mypy-0.971-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b793b899f7cf563b1e7044a5c97361196b938e92f0a4343a5d27966a53d2ec71"}, + {file = "mypy-0.971-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d1ea5d12c8e2d266b5fb8c7a5d2e9c0219fedfeb493b7ed60cd350322384ac27"}, + {file = "mypy-0.971-cp38-cp38-win_amd64.whl", hash = "sha256:23c7ff43fff4b0df93a186581885c8512bc50fc4d4910e0f838e35d6bb6b5e58"}, + {file = "mypy-0.971-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:1f7656b69974a6933e987ee8ffb951d836272d6c0f81d727f1d0e2696074d9e6"}, + {file = "mypy-0.971-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d2022bfadb7a5c2ef410d6a7c9763188afdb7f3533f22a0a32be10d571ee4bbe"}, + {file = "mypy-0.971-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ef943c72a786b0f8d90fd76e9b39ce81fb7171172daf84bf43eaf937e9f220a9"}, + {file = "mypy-0.971-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d744f72eb39f69312bc6c2abf8ff6656973120e2eb3f3ec4f758ed47e414a4bf"}, + {file = "mypy-0.971-cp39-cp39-win_amd64.whl", hash = "sha256:77a514ea15d3007d33a9e2157b0ba9c267496acf12a7f2b9b9f8446337aac5b0"}, + {file = "mypy-0.971-py3-none-any.whl", hash = "sha256:0d054ef16b071149917085f51f89555a576e2618d5d9dd70bd6eea6410af3ac9"}, + {file = "mypy-0.971.tar.gz", hash = "sha256:40b0f21484238269ae6a57200c807d80debc6459d444c0489a102d7c6a75fa56"}, +] + +[package.dependencies] +mypy-extensions = ">=0.4.3" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} +typed-ast = {version = ">=1.4.0,<2", markers = "python_version < \"3.8\""} +typing-extensions = ">=3.10" + +[package.extras] +dmypy = ["psutil (>=4.0)"] +python2 = ["typed-ast (>=1.4.0,<2)"] +reports = ["lxml"] + +[[package]] +name = "mypy-extensions" +version = "1.0.0" +description = "Type system extensions for programs checked with the mypy type checker." +optional = false +python-versions = ">=3.5" +files = [ + {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"}, + {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"}, +] + +[[package]] +name = "packaging" +version = "23.2" +description = "Core utilities for Python packages" +optional = false +python-versions = ">=3.7" +files = [ + {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"}, + {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"}, +] + +[[package]] +name = "pluggy" +version = "1.2.0" +description = "plugin and hook calling mechanisms for python" +optional = false +python-versions = ">=3.7" +files = [ + {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"}, + {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"}, +] + +[package.dependencies] +importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} + +[package.extras] +dev = ["pre-commit", "tox"] +testing = ["pytest", "pytest-benchmark"] + +[[package]] +name = "pytest" +version = "7.4.3" +description = "pytest: simple powerful testing with Python" +optional = false +python-versions = ">=3.7" +files = [ + {file = "pytest-7.4.3-py3-none-any.whl", hash = "sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac"}, + {file = "pytest-7.4.3.tar.gz", hash = "sha256:d989d136982de4e3b29dabcc838ad581c64e8ed52c11fbe86ddebd9da0818cd5"}, +] + +[package.dependencies] +colorama = {version = "*", markers = "sys_platform == \"win32\""} +exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} +importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} +iniconfig = "*" +packaging = "*" +pluggy = ">=0.12,<2.0" +tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} + +[package.extras] +testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] + +[[package]] +name = "tomli" +version = "2.0.1" +description = "A lil' TOML parser" +optional = false +python-versions = ">=3.7" +files = [ + {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, + {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, +] + +[[package]] +name = "typed-ast" +version = "1.5.5" +description = "a fork of Python 2 and 3 ast modules with type comment support" +optional = false +python-versions = ">=3.6" +files = [ + {file = "typed_ast-1.5.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4bc1efe0ce3ffb74784e06460f01a223ac1f6ab31c6bc0376a21184bf5aabe3b"}, + {file = "typed_ast-1.5.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5f7a8c46a8b333f71abd61d7ab9255440d4a588f34a21f126bbfc95f6049e686"}, + {file = "typed_ast-1.5.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:597fc66b4162f959ee6a96b978c0435bd63791e31e4f410622d19f1686d5e769"}, + {file = "typed_ast-1.5.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d41b7a686ce653e06c2609075d397ebd5b969d821b9797d029fccd71fdec8e04"}, + {file = "typed_ast-1.5.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5fe83a9a44c4ce67c796a1b466c270c1272e176603d5e06f6afbc101a572859d"}, + {file = "typed_ast-1.5.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d5c0c112a74c0e5db2c75882a0adf3133adedcdbfd8cf7c9d6ed77365ab90a1d"}, + {file = "typed_ast-1.5.5-cp310-cp310-win_amd64.whl", hash = "sha256:e1a976ed4cc2d71bb073e1b2a250892a6e968ff02aa14c1f40eba4f365ffec02"}, + {file = "typed_ast-1.5.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c631da9710271cb67b08bd3f3813b7af7f4c69c319b75475436fcab8c3d21bee"}, + {file = "typed_ast-1.5.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b445c2abfecab89a932b20bd8261488d574591173d07827c1eda32c457358b18"}, + {file = "typed_ast-1.5.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc95ffaaab2be3b25eb938779e43f513e0e538a84dd14a5d844b8f2932593d88"}, + {file = "typed_ast-1.5.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61443214d9b4c660dcf4b5307f15c12cb30bdfe9588ce6158f4a005baeb167b2"}, + {file = "typed_ast-1.5.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:6eb936d107e4d474940469e8ec5b380c9b329b5f08b78282d46baeebd3692dc9"}, + {file = "typed_ast-1.5.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e48bf27022897577d8479eaed64701ecaf0467182448bd95759883300ca818c8"}, + {file = "typed_ast-1.5.5-cp311-cp311-win_amd64.whl", hash = "sha256:83509f9324011c9a39faaef0922c6f720f9623afe3fe220b6d0b15638247206b"}, + {file = "typed_ast-1.5.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:44f214394fc1af23ca6d4e9e744804d890045d1643dd7e8229951e0ef39429b5"}, + {file = "typed_ast-1.5.5-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:118c1ce46ce58fda78503eae14b7664163aa735b620b64b5b725453696f2a35c"}, + {file = "typed_ast-1.5.5-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be4919b808efa61101456e87f2d4c75b228f4e52618621c77f1ddcaae15904fa"}, + {file = "typed_ast-1.5.5-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:fc2b8c4e1bc5cd96c1a823a885e6b158f8451cf6f5530e1829390b4d27d0807f"}, + {file = "typed_ast-1.5.5-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:16f7313e0a08c7de57f2998c85e2a69a642e97cb32f87eb65fbfe88381a5e44d"}, + {file = "typed_ast-1.5.5-cp36-cp36m-win_amd64.whl", hash = "sha256:2b946ef8c04f77230489f75b4b5a4a6f24c078be4aed241cfabe9cbf4156e7e5"}, + {file = "typed_ast-1.5.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2188bc33d85951ea4ddad55d2b35598b2709d122c11c75cffd529fbc9965508e"}, + {file = "typed_ast-1.5.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0635900d16ae133cab3b26c607586131269f88266954eb04ec31535c9a12ef1e"}, + {file = "typed_ast-1.5.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:57bfc3cf35a0f2fdf0a88a3044aafaec1d2f24d8ae8cd87c4f58d615fb5b6311"}, + {file = "typed_ast-1.5.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:fe58ef6a764de7b4b36edfc8592641f56e69b7163bba9f9c8089838ee596bfb2"}, + {file = "typed_ast-1.5.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d09d930c2d1d621f717bb217bf1fe2584616febb5138d9b3e8cdd26506c3f6d4"}, + {file = "typed_ast-1.5.5-cp37-cp37m-win_amd64.whl", hash = "sha256:d40c10326893ecab8a80a53039164a224984339b2c32a6baf55ecbd5b1df6431"}, + {file = "typed_ast-1.5.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:fd946abf3c31fb50eee07451a6aedbfff912fcd13cf357363f5b4e834cc5e71a"}, + {file = "typed_ast-1.5.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ed4a1a42df8a3dfb6b40c3d2de109e935949f2f66b19703eafade03173f8f437"}, + {file = "typed_ast-1.5.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:045f9930a1550d9352464e5149710d56a2aed23a2ffe78946478f7b5416f1ede"}, + {file = "typed_ast-1.5.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:381eed9c95484ceef5ced626355fdc0765ab51d8553fec08661dce654a935db4"}, + {file = "typed_ast-1.5.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:bfd39a41c0ef6f31684daff53befddae608f9daf6957140228a08e51f312d7e6"}, + {file = "typed_ast-1.5.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8c524eb3024edcc04e288db9541fe1f438f82d281e591c548903d5b77ad1ddd4"}, + {file = "typed_ast-1.5.5-cp38-cp38-win_amd64.whl", hash = "sha256:7f58fabdde8dcbe764cef5e1a7fcb440f2463c1bbbec1cf2a86ca7bc1f95184b"}, + {file = "typed_ast-1.5.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:042eb665ff6bf020dd2243307d11ed626306b82812aba21836096d229fdc6a10"}, + {file = "typed_ast-1.5.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:622e4a006472b05cf6ef7f9f2636edc51bda670b7bbffa18d26b255269d3d814"}, + {file = "typed_ast-1.5.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1efebbbf4604ad1283e963e8915daa240cb4bf5067053cf2f0baadc4d4fb51b8"}, + {file = "typed_ast-1.5.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f0aefdd66f1784c58f65b502b6cf8b121544680456d1cebbd300c2c813899274"}, + {file = "typed_ast-1.5.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:48074261a842acf825af1968cd912f6f21357316080ebaca5f19abbb11690c8a"}, + {file = "typed_ast-1.5.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:429ae404f69dc94b9361bb62291885894b7c6fb4640d561179548c849f8492ba"}, + {file = "typed_ast-1.5.5-cp39-cp39-win_amd64.whl", hash = "sha256:335f22ccb244da2b5c296e6f96b06ee9bed46526db0de38d2f0e5a6597b81155"}, + {file = "typed_ast-1.5.5.tar.gz", hash = "sha256:94282f7a354f36ef5dbce0ef3467ebf6a258e370ab33d5b40c249fa996e590dd"}, +] + +[[package]] +name = "typing-extensions" +version = "4.7.1" +description = "Backported and Experimental Type Hints for Python 3.7+" +optional = false +python-versions = ">=3.7" +files = [ + {file = "typing_extensions-4.7.1-py3-none-any.whl", hash = "sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36"}, + {file = "typing_extensions-4.7.1.tar.gz", hash = "sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2"}, +] + +[[package]] +name = "zipp" +version = "3.15.0" +description = "Backport of pathlib-compatible object wrapper for zip files" +optional = false +python-versions = ">=3.7" +files = [ + {file = "zipp-3.15.0-py3-none-any.whl", hash = "sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556"}, + {file = "zipp-3.15.0.tar.gz", hash = "sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b"}, +] + +[package.extras] +docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] + +[metadata] +lock-version = "2.0" +python-versions = "^3.7" +content-hash = "8f1a750431de61923c5ae01e8d2ff337abc96e16b9634fa815794785d30cb2b4" diff --git a/seed/pydantic/optional/pyproject.toml b/seed/pydantic/optional/pyproject.toml new file mode 100644 index 000000000..ec5de40f4 --- /dev/null +++ b/seed/pydantic/optional/pyproject.toml @@ -0,0 +1,20 @@ +[tool.poetry] +name = "seed" +version = "0.0.0" +description = "" +readme = "README.md" +authors = [] +packages = [ + { include = "seed/objects_with_imports", from = "src"} +] + +[tool.poetry.dependencies] +python = "^3.7" + +[tool.poetry.dev-dependencies] +mypy = "0.971" +pytest = "^7.4.0" + +[build-system] +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/seed/pydantic/optional/snippet.json b/seed/pydantic/optional/snippet.json new file mode 100644 index 000000000..e69de29bb diff --git a/seed/sdk/api-wide-base-path/src/seed/resources/service/__init__.py b/seed/pydantic/optional/src/seed/objects_with_imports/__init__.py similarity index 100% rename from seed/sdk/api-wide-base-path/src/seed/resources/service/__init__.py rename to seed/pydantic/optional/src/seed/objects_with_imports/__init__.py diff --git a/seed/pydantic/optional/src/seed/objects_with_imports/core/__init__.py b/seed/pydantic/optional/src/seed/objects_with_imports/core/__init__.py new file mode 100644 index 000000000..eb065eb76 --- /dev/null +++ b/seed/pydantic/optional/src/seed/objects_with_imports/core/__init__.py @@ -0,0 +1,5 @@ +# This file was auto-generated by Fern from our API Definition. + +from .datetime_utils import serialize_datetime + +__all__ = ["serialize_datetime"] diff --git a/seed/pydantic/optional/src/seed/objects_with_imports/core/datetime_utils.py b/seed/pydantic/optional/src/seed/objects_with_imports/core/datetime_utils.py new file mode 100644 index 000000000..7c9864a94 --- /dev/null +++ b/seed/pydantic/optional/src/seed/objects_with_imports/core/datetime_utils.py @@ -0,0 +1,28 @@ +# This file was auto-generated by Fern from our API Definition. + +import datetime as dt + + +def serialize_datetime(v: dt.datetime) -> str: + """ + Serialize a datetime including timezone info. + + Uses the timezone info provided if present, otherwise uses the current runtime's timezone info. + + UTC datetimes end in "Z" while all other timezones are represented as offset from UTC, e.g. +05:00. + """ + + def _serialize_zoned_datetime(v: dt.datetime) -> str: + if v.tzinfo is not None and v.tzinfo.tzname(None) == dt.timezone.utc.tzname(None): + # UTC is a special case where we use "Z" at the end instead of "+00:00" + return v.isoformat().replace("+00:00", "Z") + else: + # Delegate to the typical +/- offset format + return v.isoformat() + + if v.tzinfo is not None: + return _serialize_zoned_datetime(v) + else: + local_tz = dt.datetime.now().astimezone().tzinfo + localized_dt = v.replace(tzinfo=local_tz) + return _serialize_zoned_datetime(localized_dt) diff --git a/seed/pydantic/optional/src/seed/objects_with_imports/py.typed b/seed/pydantic/optional/src/seed/objects_with_imports/py.typed new file mode 100644 index 000000000..e69de29bb diff --git a/seed/pydantic/optional/tests/__init__.py b/seed/pydantic/optional/tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/seed/pydantic/optional/tests/test_client.py b/seed/pydantic/optional/tests/test_client.py new file mode 100644 index 000000000..60a58e64c --- /dev/null +++ b/seed/pydantic/optional/tests/test_client.py @@ -0,0 +1,6 @@ +import pytest + +# Get started with writing tests with pytest at https://docs.pytest.org +@pytest.mark.skip(reason="Unimplemented") +def test_client() -> None: + assert True == True diff --git a/seed/pydantic/seed.yml b/seed/pydantic/seed.yml index 1c3562426..eaa07a5f3 100644 --- a/seed/pydantic/seed.yml +++ b/seed/pydantic/seed.yml @@ -12,3 +12,5 @@ fixtures: - customConfig: version: v2 outputFolder: pydantic-v2 +allowedFailures: + - enum \ No newline at end of file diff --git a/seed/pydantic/trace/src/seed/trace/resources/submission/execution_session_state.py b/seed/pydantic/trace/src/seed/trace/resources/submission/execution_session_state.py index 6eeea4133..6ee23586a 100644 --- a/seed/pydantic/trace/src/seed/trace/resources/submission/execution_session_state.py +++ b/seed/pydantic/trace/src/seed/trace/resources/submission/execution_session_state.py @@ -16,7 +16,7 @@ class ExecutionSessionState(pydantic.BaseModel): last_time_contacted: typing.Optional[str] = pydantic.Field(alias="lastTimeContacted") session_id: str = pydantic.Field( - alias="sessionId", description=("The auto-generated session id. Formatted as a uuid.\n") + alias="sessionId", description="The auto-generated session id. Formatted as a uuid." ) is_warm_instance: bool = pydantic.Field(alias="isWarmInstance") aws_task_id: typing.Optional[str] = pydantic.Field(alias="awsTaskId") diff --git a/seed/sdk/alias/src/seed/__init__.py b/seed/sdk/alias/src/seed/__init__.py index 400c42a66..8a734f615 100644 --- a/seed/sdk/alias/src/seed/__init__.py +++ b/seed/sdk/alias/src/seed/__init__.py @@ -1,5 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .types import Object, Type, TypeId +from .object import Object +from .type import Type +from .type_id import TypeId __all__ = ["Object", "Type", "TypeId"] diff --git a/seed/sdk/alias/src/seed/types/object.py b/seed/sdk/alias/src/seed/object.py similarity index 100% rename from seed/sdk/alias/src/seed/types/object.py rename to seed/sdk/alias/src/seed/object.py diff --git a/seed/sdk/alias/src/seed/types/type.py b/seed/sdk/alias/src/seed/type.py similarity index 94% rename from seed/sdk/alias/src/seed/types/type.py rename to seed/sdk/alias/src/seed/type.py index 374a077f5..2bd0b1074 100644 --- a/seed/sdk/alias/src/seed/types/type.py +++ b/seed/sdk/alias/src/seed/type.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ..core.datetime_utils import serialize_datetime +from .core.datetime_utils import serialize_datetime from .type_id import TypeId try: diff --git a/seed/sdk/alias/src/seed/types/type_id.py b/seed/sdk/alias/src/seed/type_id.py similarity index 100% rename from seed/sdk/alias/src/seed/types/type_id.py rename to seed/sdk/alias/src/seed/type_id.py diff --git a/seed/sdk/alias/src/seed/types/__init__.py b/seed/sdk/alias/src/seed/types/__init__.py deleted file mode 100644 index 8a734f615..000000000 --- a/seed/sdk/alias/src/seed/types/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .object import Object -from .type import Type -from .type_id import TypeId - -__all__ = ["Object", "Type", "TypeId"] diff --git a/seed/sdk/api-wide-base-path/src/seed/__init__.py b/seed/sdk/api-wide-base-path/src/seed/__init__.py index e2f27dfce..43ae725f5 100644 --- a/seed/sdk/api-wide-base-path/src/seed/__init__.py +++ b/seed/sdk/api-wide-base-path/src/seed/__init__.py @@ -1,5 +1,5 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import service +from . import service __all__ = ["service"] diff --git a/seed/sdk/api-wide-base-path/src/seed/client.py b/seed/sdk/api-wide-base-path/src/seed/client.py index d97787f8b..6c79cc5b5 100644 --- a/seed/sdk/api-wide-base-path/src/seed/client.py +++ b/seed/sdk/api-wide-base-path/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.service.client import AsyncServiceClient, ServiceClient +from .service._client import AsyncServiceClient, ServiceClient class SeedApiWideBasePath: diff --git a/seed/sdk/auth-environment-variables/src/seed/resources/service/__init__.py b/seed/sdk/api-wide-base-path/src/seed/service/__init__.py similarity index 100% rename from seed/sdk/auth-environment-variables/src/seed/resources/service/__init__.py rename to seed/sdk/api-wide-base-path/src/seed/service/__init__.py diff --git a/seed/sdk/api-wide-base-path/src/seed/resources/service/client.py b/seed/sdk/api-wide-base-path/src/seed/service/_client.py similarity index 95% rename from seed/sdk/api-wide-base-path/src/seed/resources/service/client.py rename to seed/sdk/api-wide-base-path/src/seed/service/_client.py index 6fb418b2f..b9dcd9b36 100644 --- a/seed/sdk/api-wide-base-path/src/seed/resources/service/client.py +++ b/seed/sdk/api-wide-base-path/src/seed/service/_client.py @@ -3,8 +3,8 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper class ServiceClient: diff --git a/seed/sdk/audiences/src/seed/__init__.py b/seed/sdk/audiences/src/seed/__init__.py index 10204b9ae..46de64574 100644 --- a/seed/sdk/audiences/src/seed/__init__.py +++ b/seed/sdk/audiences/src/seed/__init__.py @@ -1,5 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import Imported, ImportingType, OptionalString, commons, folder_a, folder_b, folder_c, foo +from . import commons, folder_a, folder_b, folder_c, foo +from .commons import Imported +from .foo import ImportingType, OptionalString __all__ = ["Imported", "ImportingType", "OptionalString", "commons", "folder_a", "folder_b", "folder_c", "foo"] diff --git a/seed/sdk/audiences/src/seed/client.py b/seed/sdk/audiences/src/seed/client.py index 2fc32bb05..af650459a 100644 --- a/seed/sdk/audiences/src/seed/client.py +++ b/seed/sdk/audiences/src/seed/client.py @@ -5,8 +5,8 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.folder_a.client import AsyncFolderAClient, FolderAClient -from .resources.foo.client import AsyncFooClient, FooClient +from .folder_a._client import AsyncFolderAClient, FolderAClient +from .foo._client import AsyncFooClient, FooClient class SeedAudiences: diff --git a/seed/sdk/audiences/src/seed/resources/commons/types/__init__.py b/seed/sdk/audiences/src/seed/commons/__init__.py similarity index 100% rename from seed/sdk/audiences/src/seed/resources/commons/types/__init__.py rename to seed/sdk/audiences/src/seed/commons/__init__.py diff --git a/seed/sdk/audiences/src/seed/resources/commons/types/imported.py b/seed/sdk/audiences/src/seed/commons/imported.py similarity index 100% rename from seed/sdk/audiences/src/seed/resources/commons/types/imported.py rename to seed/sdk/audiences/src/seed/commons/imported.py diff --git a/seed/sdk/audiences/src/seed/resources/folder_a/resources/__init__.py b/seed/sdk/audiences/src/seed/folder_a/__init__.py similarity index 100% rename from seed/sdk/audiences/src/seed/resources/folder_a/resources/__init__.py rename to seed/sdk/audiences/src/seed/folder_a/__init__.py diff --git a/seed/sdk/audiences/src/seed/resources/folder_a/client.py b/seed/sdk/audiences/src/seed/folder_a/_client.py similarity index 77% rename from seed/sdk/audiences/src/seed/resources/folder_a/client.py rename to seed/sdk/audiences/src/seed/folder_a/_client.py index 6be20adc8..4d87cc7a6 100644 --- a/seed/sdk/audiences/src/seed/resources/folder_a/client.py +++ b/seed/sdk/audiences/src/seed/folder_a/_client.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.service.client import AsyncServiceClient, ServiceClient +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .service._client import AsyncServiceClient, ServiceClient class FolderAClient: diff --git a/seed/sdk/audiences/src/seed/resources/folder_a/resources/service/types/__init__.py b/seed/sdk/audiences/src/seed/folder_a/service/__init__.py similarity index 100% rename from seed/sdk/audiences/src/seed/resources/folder_a/resources/service/types/__init__.py rename to seed/sdk/audiences/src/seed/folder_a/service/__init__.py diff --git a/seed/sdk/audiences/src/seed/resources/folder_a/resources/service/client.py b/seed/sdk/audiences/src/seed/folder_a/service/_client.py similarity index 91% rename from seed/sdk/audiences/src/seed/resources/folder_a/resources/service/client.py rename to seed/sdk/audiences/src/seed/folder_a/service/_client.py index f2cf6d6a9..b23bb873f 100644 --- a/seed/sdk/audiences/src/seed/resources/folder_a/resources/service/client.py +++ b/seed/sdk/audiences/src/seed/folder_a/service/_client.py @@ -2,9 +2,9 @@ from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .types.response import Response +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .response import Response try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/audiences/src/seed/resources/folder_a/resources/service/types/response.py b/seed/sdk/audiences/src/seed/folder_a/service/response.py similarity index 87% rename from seed/sdk/audiences/src/seed/resources/folder_a/resources/service/types/response.py rename to seed/sdk/audiences/src/seed/folder_a/service/response.py index 95765f287..ffa2be7cc 100644 --- a/seed/sdk/audiences/src/seed/resources/folder_a/resources/service/types/response.py +++ b/seed/sdk/audiences/src/seed/folder_a/service/response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from .....folder_b.resources.common.types.foo import Foo +from ...core.datetime_utils import serialize_datetime +from ...folder_b.common.foo import Foo try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/audiences/src/seed/resources/folder_b/resources/__init__.py b/seed/sdk/audiences/src/seed/folder_b/__init__.py similarity index 100% rename from seed/sdk/audiences/src/seed/resources/folder_b/resources/__init__.py rename to seed/sdk/audiences/src/seed/folder_b/__init__.py diff --git a/seed/sdk/audiences/src/seed/resources/folder_b/resources/common/types/__init__.py b/seed/sdk/audiences/src/seed/folder_b/common/__init__.py similarity index 100% rename from seed/sdk/audiences/src/seed/resources/folder_b/resources/common/types/__init__.py rename to seed/sdk/audiences/src/seed/folder_b/common/__init__.py diff --git a/seed/sdk/audiences/src/seed/folder_b/common/foo.py b/seed/sdk/audiences/src/seed/folder_b/common/foo.py new file mode 100644 index 000000000..2e33300cb --- /dev/null +++ b/seed/sdk/audiences/src/seed/folder_b/common/foo.py @@ -0,0 +1,29 @@ +# This file was auto-generated by Fern from our API Definition. + +import datetime as dt +import typing + +from ...core.datetime_utils import serialize_datetime +from ...folder_c.common.foo import Foo as folder_c_common_foo_Foo + +try: + import pydantic.v1 as pydantic # type: ignore +except ImportError: + import pydantic # type: ignore + + +class Foo(pydantic.BaseModel): + foo: typing.Optional[folder_c_common_foo_Foo] + + def json(self, **kwargs: typing.Any) -> str: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().json(**kwargs_with_defaults) + + def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().dict(**kwargs_with_defaults) + + class Config: + frozen = True + smart_union = True + json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/audiences/src/seed/resources/folder_c/resources/__init__.py b/seed/sdk/audiences/src/seed/folder_c/__init__.py similarity index 100% rename from seed/sdk/audiences/src/seed/resources/folder_c/resources/__init__.py rename to seed/sdk/audiences/src/seed/folder_c/__init__.py diff --git a/seed/sdk/audiences/src/seed/resources/folder_c/resources/common/types/__init__.py b/seed/sdk/audiences/src/seed/folder_c/common/__init__.py similarity index 100% rename from seed/sdk/audiences/src/seed/resources/folder_c/resources/common/types/__init__.py rename to seed/sdk/audiences/src/seed/folder_c/common/__init__.py diff --git a/seed/sdk/audiences/src/seed/resources/folder_c/resources/common/types/foo.py b/seed/sdk/audiences/src/seed/folder_c/common/foo.py similarity index 93% rename from seed/sdk/audiences/src/seed/resources/folder_c/resources/common/types/foo.py rename to seed/sdk/audiences/src/seed/folder_c/common/foo.py index e8e73622a..c1b6807fe 100644 --- a/seed/sdk/audiences/src/seed/resources/folder_c/resources/common/types/foo.py +++ b/seed/sdk/audiences/src/seed/folder_c/common/foo.py @@ -4,7 +4,7 @@ import typing import uuid -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/audiences/src/seed/resources/foo/types/__init__.py b/seed/sdk/audiences/src/seed/foo/__init__.py similarity index 100% rename from seed/sdk/audiences/src/seed/resources/foo/types/__init__.py rename to seed/sdk/audiences/src/seed/foo/__init__.py diff --git a/seed/sdk/audiences/src/seed/resources/foo/client.py b/seed/sdk/audiences/src/seed/foo/_client.py similarity index 88% rename from seed/sdk/audiences/src/seed/resources/foo/client.py rename to seed/sdk/audiences/src/seed/foo/_client.py index c26bcc04e..3f5f5fe86 100644 --- a/seed/sdk/audiences/src/seed/resources/foo/client.py +++ b/seed/sdk/audiences/src/seed/foo/_client.py @@ -2,11 +2,11 @@ from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.remove_none_from_dict import remove_none_from_dict -from .types.importing_type import ImportingType -from .types.optional_string import OptionalString +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.remove_none_from_dict import remove_none_from_dict +from .importing_type import ImportingType +from .optional_string import OptionalString try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/audiences/src/seed/resources/foo/types/importing_type.py b/seed/sdk/audiences/src/seed/foo/importing_type.py similarity index 89% rename from seed/sdk/audiences/src/seed/resources/foo/types/importing_type.py rename to seed/sdk/audiences/src/seed/foo/importing_type.py index 9d722ea48..ecbe614dc 100644 --- a/seed/sdk/audiences/src/seed/resources/foo/types/importing_type.py +++ b/seed/sdk/audiences/src/seed/foo/importing_type.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.imported import Imported +from ..commons.imported import Imported +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/audiences/src/seed/resources/foo/types/optional_string.py b/seed/sdk/audiences/src/seed/foo/optional_string.py similarity index 100% rename from seed/sdk/audiences/src/seed/resources/foo/types/optional_string.py rename to seed/sdk/audiences/src/seed/foo/optional_string.py diff --git a/seed/sdk/audiences/src/seed/resources/__init__.py b/seed/sdk/audiences/src/seed/resources/__init__.py deleted file mode 100644 index 46de64574..000000000 --- a/seed/sdk/audiences/src/seed/resources/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import commons, folder_a, folder_b, folder_c, foo -from .commons import Imported -from .foo import ImportingType, OptionalString - -__all__ = ["Imported", "ImportingType", "OptionalString", "commons", "folder_a", "folder_b", "folder_c", "foo"] diff --git a/seed/sdk/audiences/src/seed/resources/commons/__init__.py b/seed/sdk/audiences/src/seed/resources/commons/__init__.py deleted file mode 100644 index 30a8abe1f..000000000 --- a/seed/sdk/audiences/src/seed/resources/commons/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Imported - -__all__ = ["Imported"] diff --git a/seed/sdk/audiences/src/seed/resources/folder_a/__init__.py b/seed/sdk/audiences/src/seed/resources/folder_a/__init__.py deleted file mode 100644 index 68f550d75..000000000 --- a/seed/sdk/audiences/src/seed/resources/folder_a/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import Response, service - -__all__ = ["Response", "service"] diff --git a/seed/sdk/audiences/src/seed/resources/folder_b/__init__.py b/seed/sdk/audiences/src/seed/resources/folder_b/__init__.py deleted file mode 100644 index 995ed6291..000000000 --- a/seed/sdk/audiences/src/seed/resources/folder_b/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import Foo, common - -__all__ = ["Foo", "common"] diff --git a/seed/sdk/audiences/src/seed/resources/folder_b/resources/common/types/foo.py b/seed/sdk/audiences/src/seed/resources/folder_b/resources/common/types/foo.py deleted file mode 100644 index 744d607bd..000000000 --- a/seed/sdk/audiences/src/seed/resources/folder_b/resources/common/types/foo.py +++ /dev/null @@ -1,29 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -import datetime as dt -import typing - -from ......core.datetime_utils import serialize_datetime -from .....folder_c.resources.common.types.foo import Foo as resources_folder_c_resources_common_types_foo_Foo - -try: - import pydantic.v1 as pydantic # type: ignore -except ImportError: - import pydantic # type: ignore - - -class Foo(pydantic.BaseModel): - foo: typing.Optional[resources_folder_c_resources_common_types_foo_Foo] - - def json(self, **kwargs: typing.Any) -> str: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().json(**kwargs_with_defaults) - - def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().dict(**kwargs_with_defaults) - - class Config: - frozen = True - smart_union = True - json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/audiences/src/seed/resources/folder_c/__init__.py b/seed/sdk/audiences/src/seed/resources/folder_c/__init__.py deleted file mode 100644 index 995ed6291..000000000 --- a/seed/sdk/audiences/src/seed/resources/folder_c/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import Foo, common - -__all__ = ["Foo", "common"] diff --git a/seed/sdk/audiences/src/seed/resources/folder_c/resources/common/__init__.py b/seed/sdk/audiences/src/seed/resources/folder_c/resources/common/__init__.py deleted file mode 100644 index a06e03f9d..000000000 --- a/seed/sdk/audiences/src/seed/resources/folder_c/resources/common/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Foo - -__all__ = ["Foo"] diff --git a/seed/sdk/audiences/src/seed/resources/foo/__init__.py b/seed/sdk/audiences/src/seed/resources/foo/__init__.py deleted file mode 100644 index bd94894d3..000000000 --- a/seed/sdk/audiences/src/seed/resources/foo/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ImportingType, OptionalString - -__all__ = ["ImportingType", "OptionalString"] diff --git a/seed/sdk/auth-environment-variables/src/seed/__init__.py b/seed/sdk/auth-environment-variables/src/seed/__init__.py index e2f27dfce..43ae725f5 100644 --- a/seed/sdk/auth-environment-variables/src/seed/__init__.py +++ b/seed/sdk/auth-environment-variables/src/seed/__init__.py @@ -1,5 +1,5 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import service +from . import service __all__ = ["service"] diff --git a/seed/sdk/auth-environment-variables/src/seed/client.py b/seed/sdk/auth-environment-variables/src/seed/client.py index ccc103ced..13b531bff 100644 --- a/seed/sdk/auth-environment-variables/src/seed/client.py +++ b/seed/sdk/auth-environment-variables/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.service.client import AsyncServiceClient, ServiceClient +from .service._client import AsyncServiceClient, ServiceClient class SeedAuthEnvironmentVariables: diff --git a/seed/sdk/basic-auth/src/seed/resources/basic_auth/__init__.py b/seed/sdk/auth-environment-variables/src/seed/service/__init__.py similarity index 100% rename from seed/sdk/basic-auth/src/seed/resources/basic_auth/__init__.py rename to seed/sdk/auth-environment-variables/src/seed/service/__init__.py diff --git a/seed/sdk/auth-environment-variables/src/seed/resources/service/client.py b/seed/sdk/auth-environment-variables/src/seed/service/_client.py similarity index 94% rename from seed/sdk/auth-environment-variables/src/seed/resources/service/client.py rename to seed/sdk/auth-environment-variables/src/seed/service/_client.py index 86a2a1ac0..04a50a471 100644 --- a/seed/sdk/auth-environment-variables/src/seed/resources/service/client.py +++ b/seed/sdk/auth-environment-variables/src/seed/service/_client.py @@ -3,8 +3,8 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/basic-auth/src/seed/__init__.py b/seed/sdk/basic-auth/src/seed/__init__.py index a9fe72c7d..c596ee69b 100644 --- a/seed/sdk/basic-auth/src/seed/__init__.py +++ b/seed/sdk/basic-auth/src/seed/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import BadRequest, UnauthorizedRequest, UnauthorizedRequestErrorBody, basic_auth, errors +from .errors import BadRequest, UnauthorizedRequest, UnauthorizedRequestErrorBody +from . import basic_auth, errors __all__ = ["BadRequest", "UnauthorizedRequest", "UnauthorizedRequestErrorBody", "basic_auth", "errors"] diff --git a/seed/sdk/bearer-token-environment-variable/src/seed/resources/service/__init__.py b/seed/sdk/basic-auth/src/seed/basic_auth/__init__.py similarity index 100% rename from seed/sdk/bearer-token-environment-variable/src/seed/resources/service/__init__.py rename to seed/sdk/basic-auth/src/seed/basic_auth/__init__.py diff --git a/seed/sdk/basic-auth/src/seed/resources/basic_auth/client.py b/seed/sdk/basic-auth/src/seed/basic_auth/_client.py similarity index 92% rename from seed/sdk/basic-auth/src/seed/resources/basic_auth/client.py rename to seed/sdk/basic-auth/src/seed/basic_auth/_client.py index 11e469906..b3af892ce 100644 --- a/seed/sdk/basic-auth/src/seed/resources/basic_auth/client.py +++ b/seed/sdk/basic-auth/src/seed/basic_auth/_client.py @@ -4,12 +4,12 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..errors.errors.bad_request import BadRequest -from ..errors.errors.unauthorized_request import UnauthorizedRequest -from ..errors.types.unauthorized_request_error_body import UnauthorizedRequestErrorBody +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..errors.bad_request import BadRequest +from ..errors.unauthorized_request import UnauthorizedRequest +from ..errors.unauthorized_request_error_body import UnauthorizedRequestErrorBody try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/basic-auth/src/seed/client.py b/seed/sdk/basic-auth/src/seed/client.py index 211f5b90e..dc30f2638 100644 --- a/seed/sdk/basic-auth/src/seed/client.py +++ b/seed/sdk/basic-auth/src/seed/client.py @@ -4,8 +4,8 @@ import httpx +from .basic_auth._client import AsyncBasicAuthClient, BasicAuthClient from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.basic_auth.client import AsyncBasicAuthClient, BasicAuthClient class SeedBasicAuth: diff --git a/seed/sdk/basic-auth/src/seed/resources/errors/errors/__init__.py b/seed/sdk/basic-auth/src/seed/errors/__init__.py similarity index 50% rename from seed/sdk/basic-auth/src/seed/resources/errors/errors/__init__.py rename to seed/sdk/basic-auth/src/seed/errors/__init__.py index 3ec728060..319fce358 100644 --- a/seed/sdk/basic-auth/src/seed/resources/errors/errors/__init__.py +++ b/seed/sdk/basic-auth/src/seed/errors/__init__.py @@ -2,5 +2,6 @@ from .bad_request import BadRequest from .unauthorized_request import UnauthorizedRequest +from .unauthorized_request_error_body import UnauthorizedRequestErrorBody -__all__ = ["BadRequest", "UnauthorizedRequest"] +__all__ = ["BadRequest", "UnauthorizedRequest", "UnauthorizedRequestErrorBody"] diff --git a/seed/sdk/custom-auth/src/seed/resources/errors/errors/bad_request.py b/seed/sdk/basic-auth/src/seed/errors/bad_request.py similarity index 80% rename from seed/sdk/custom-auth/src/seed/resources/errors/errors/bad_request.py rename to seed/sdk/basic-auth/src/seed/errors/bad_request.py index b3953d6b0..4888e1a2b 100644 --- a/seed/sdk/custom-auth/src/seed/resources/errors/errors/bad_request.py +++ b/seed/sdk/basic-auth/src/seed/errors/bad_request.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.api_error import ApiError +from ..core.api_error import ApiError class BadRequest(ApiError): diff --git a/seed/sdk/basic-auth/src/seed/resources/errors/errors/unauthorized_request.py b/seed/sdk/basic-auth/src/seed/errors/unauthorized_request.py similarity index 64% rename from seed/sdk/basic-auth/src/seed/resources/errors/errors/unauthorized_request.py rename to seed/sdk/basic-auth/src/seed/errors/unauthorized_request.py index 50bb0aae4..8af082011 100644 --- a/seed/sdk/basic-auth/src/seed/resources/errors/errors/unauthorized_request.py +++ b/seed/sdk/basic-auth/src/seed/errors/unauthorized_request.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.api_error import ApiError -from ..types.unauthorized_request_error_body import UnauthorizedRequestErrorBody +from ..core.api_error import ApiError +from .unauthorized_request_error_body import UnauthorizedRequestErrorBody class UnauthorizedRequest(ApiError): diff --git a/seed/sdk/custom-auth/src/seed/resources/errors/types/unauthorized_request_error_body.py b/seed/sdk/basic-auth/src/seed/errors/unauthorized_request_error_body.py similarity index 93% rename from seed/sdk/custom-auth/src/seed/resources/errors/types/unauthorized_request_error_body.py rename to seed/sdk/basic-auth/src/seed/errors/unauthorized_request_error_body.py index 46a4b536e..726f1738b 100644 --- a/seed/sdk/custom-auth/src/seed/resources/errors/types/unauthorized_request_error_body.py +++ b/seed/sdk/basic-auth/src/seed/errors/unauthorized_request_error_body.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/basic-auth/src/seed/resources/__init__.py b/seed/sdk/basic-auth/src/seed/resources/__init__.py deleted file mode 100644 index c596ee69b..000000000 --- a/seed/sdk/basic-auth/src/seed/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .errors import BadRequest, UnauthorizedRequest, UnauthorizedRequestErrorBody -from . import basic_auth, errors - -__all__ = ["BadRequest", "UnauthorizedRequest", "UnauthorizedRequestErrorBody", "basic_auth", "errors"] diff --git a/seed/sdk/basic-auth/src/seed/resources/errors/__init__.py b/seed/sdk/basic-auth/src/seed/resources/errors/__init__.py deleted file mode 100644 index b32086d7c..000000000 --- a/seed/sdk/basic-auth/src/seed/resources/errors/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import UnauthorizedRequestErrorBody -from .errors import BadRequest, UnauthorizedRequest - -__all__ = ["BadRequest", "UnauthorizedRequest", "UnauthorizedRequestErrorBody"] diff --git a/seed/sdk/basic-auth/src/seed/resources/errors/types/__init__.py b/seed/sdk/basic-auth/src/seed/resources/errors/types/__init__.py deleted file mode 100644 index c21167244..000000000 --- a/seed/sdk/basic-auth/src/seed/resources/errors/types/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .unauthorized_request_error_body import UnauthorizedRequestErrorBody - -__all__ = ["UnauthorizedRequestErrorBody"] diff --git a/seed/sdk/bearer-token-environment-variable/src/seed/__init__.py b/seed/sdk/bearer-token-environment-variable/src/seed/__init__.py index e2f27dfce..43ae725f5 100644 --- a/seed/sdk/bearer-token-environment-variable/src/seed/__init__.py +++ b/seed/sdk/bearer-token-environment-variable/src/seed/__init__.py @@ -1,5 +1,5 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import service +from . import service __all__ = ["service"] diff --git a/seed/sdk/bearer-token-environment-variable/src/seed/client.py b/seed/sdk/bearer-token-environment-variable/src/seed/client.py index 1604d7ffa..cb5b5470e 100644 --- a/seed/sdk/bearer-token-environment-variable/src/seed/client.py +++ b/seed/sdk/bearer-token-environment-variable/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.service.client import AsyncServiceClient, ServiceClient +from .service._client import AsyncServiceClient, ServiceClient class SeedBearerTokenEnvironmentVariable: diff --git a/seed/sdk/bearer-token-environment-variable/src/seed/resources/__init__.py b/seed/sdk/bearer-token-environment-variable/src/seed/resources/__init__.py deleted file mode 100644 index 43ae725f5..000000000 --- a/seed/sdk/bearer-token-environment-variable/src/seed/resources/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import service - -__all__ = ["service"] diff --git a/seed/sdk/bytes/src/seed/resources/service/__init__.py b/seed/sdk/bearer-token-environment-variable/src/seed/service/__init__.py similarity index 100% rename from seed/sdk/bytes/src/seed/resources/service/__init__.py rename to seed/sdk/bearer-token-environment-variable/src/seed/service/__init__.py diff --git a/seed/sdk/bearer-token-environment-variable/src/seed/resources/service/client.py b/seed/sdk/bearer-token-environment-variable/src/seed/service/_client.py similarity index 94% rename from seed/sdk/bearer-token-environment-variable/src/seed/resources/service/client.py rename to seed/sdk/bearer-token-environment-variable/src/seed/service/_client.py index 01da6e35a..2fadcf2d1 100644 --- a/seed/sdk/bearer-token-environment-variable/src/seed/resources/service/client.py +++ b/seed/sdk/bearer-token-environment-variable/src/seed/service/_client.py @@ -3,8 +3,8 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/bytes/src/seed/__init__.py b/seed/sdk/bytes/src/seed/__init__.py index e2f27dfce..43ae725f5 100644 --- a/seed/sdk/bytes/src/seed/__init__.py +++ b/seed/sdk/bytes/src/seed/__init__.py @@ -1,5 +1,5 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import service +from . import service __all__ = ["service"] diff --git a/seed/sdk/bytes/src/seed/client.py b/seed/sdk/bytes/src/seed/client.py index 7322c1909..79eb2a830 100644 --- a/seed/sdk/bytes/src/seed/client.py +++ b/seed/sdk/bytes/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.service.client import AsyncServiceClient, ServiceClient +from .service._client import AsyncServiceClient, ServiceClient class SeedBytes: diff --git a/seed/sdk/bytes/src/seed/resources/__init__.py b/seed/sdk/bytes/src/seed/resources/__init__.py deleted file mode 100644 index 43ae725f5..000000000 --- a/seed/sdk/bytes/src/seed/resources/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import service - -__all__ = ["service"] diff --git a/seed/sdk/custom-auth/src/seed/resources/custom_auth/__init__.py b/seed/sdk/bytes/src/seed/service/__init__.py similarity index 100% rename from seed/sdk/custom-auth/src/seed/resources/custom_auth/__init__.py rename to seed/sdk/bytes/src/seed/service/__init__.py diff --git a/seed/sdk/bytes/src/seed/resources/service/client.py b/seed/sdk/bytes/src/seed/service/_client.py similarity index 94% rename from seed/sdk/bytes/src/seed/resources/service/client.py rename to seed/sdk/bytes/src/seed/service/_client.py index 7bf4eb45d..c2673f7f8 100644 --- a/seed/sdk/bytes/src/seed/resources/service/client.py +++ b/seed/sdk/bytes/src/seed/service/_client.py @@ -4,8 +4,8 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper # this is used as the default value for optional parameters OMIT = typing.cast(typing.Any, ...) diff --git a/seed/sdk/circular-references/src/seed/__init__.py b/seed/sdk/circular-references/src/seed/__init__.py index 4f8e4409e..10ae0a39a 100644 --- a/seed/sdk/circular-references/src/seed/__init__.py +++ b/seed/sdk/circular-references/src/seed/__init__.py @@ -1,8 +1,8 @@ # This file was auto-generated by Fern from our API Definition. -from .types import ImportingA, RootType -from .resources import ( - A, +from . import a, ast +from .a import A +from .ast import ( ContainerValue, ContainerValue_List, ContainerValue_Optional, @@ -12,9 +12,9 @@ FieldValue_PrimitiveValue, ObjectValue, PrimitiveValue, - a, - ast, ) +from .importing_a import ImportingA +from .root_type import RootType __all__ = [ "A", diff --git a/seed/sdk/circular-references/src/seed/resources/a/types/__init__.py b/seed/sdk/circular-references/src/seed/a/__init__.py similarity index 100% rename from seed/sdk/circular-references/src/seed/resources/a/types/__init__.py rename to seed/sdk/circular-references/src/seed/a/__init__.py diff --git a/seed/sdk/circular-references/src/seed/resources/a/types/a.py b/seed/sdk/circular-references/src/seed/a/a.py similarity index 88% rename from seed/sdk/circular-references/src/seed/resources/a/types/a.py rename to seed/sdk/circular-references/src/seed/a/a.py index dd1972bb6..47fd7ca73 100644 --- a/seed/sdk/circular-references/src/seed/resources/a/types/a.py +++ b/seed/sdk/circular-references/src/seed/a/a.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ....types.root_type import RootType +from ..core.datetime_utils import serialize_datetime +from ..root_type import RootType class A(RootType): diff --git a/seed/sdk/circular-references/src/seed/resources/ast/types/__init__.py b/seed/sdk/circular-references/src/seed/ast/__init__.py similarity index 100% rename from seed/sdk/circular-references/src/seed/resources/ast/types/__init__.py rename to seed/sdk/circular-references/src/seed/ast/__init__.py diff --git a/seed/sdk/circular-references/src/seed/resources/ast/types/container_value.py b/seed/sdk/circular-references/src/seed/ast/container_value.py similarity index 100% rename from seed/sdk/circular-references/src/seed/resources/ast/types/container_value.py rename to seed/sdk/circular-references/src/seed/ast/container_value.py diff --git a/seed/sdk/circular-references/src/seed/resources/ast/types/field_value.py b/seed/sdk/circular-references/src/seed/ast/field_value.py similarity index 100% rename from seed/sdk/circular-references/src/seed/resources/ast/types/field_value.py rename to seed/sdk/circular-references/src/seed/ast/field_value.py diff --git a/seed/sdk/circular-references/src/seed/resources/ast/types/object_value.py b/seed/sdk/circular-references/src/seed/ast/object_value.py similarity index 93% rename from seed/sdk/circular-references/src/seed/resources/ast/types/object_value.py rename to seed/sdk/circular-references/src/seed/ast/object_value.py index 1e39b6b9d..73d546be6 100644 --- a/seed/sdk/circular-references/src/seed/resources/ast/types/object_value.py +++ b/seed/sdk/circular-references/src/seed/ast/object_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/circular-references/src/seed/resources/ast/types/primitive_value.py b/seed/sdk/circular-references/src/seed/ast/primitive_value.py similarity index 100% rename from seed/sdk/circular-references/src/seed/resources/ast/types/primitive_value.py rename to seed/sdk/circular-references/src/seed/ast/primitive_value.py diff --git a/seed/sdk/circular-references/src/seed/types/importing_a.py b/seed/sdk/circular-references/src/seed/importing_a.py similarity index 90% rename from seed/sdk/circular-references/src/seed/types/importing_a.py rename to seed/sdk/circular-references/src/seed/importing_a.py index 968f9b2fc..afd5d19de 100644 --- a/seed/sdk/circular-references/src/seed/types/importing_a.py +++ b/seed/sdk/circular-references/src/seed/importing_a.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ..core.datetime_utils import serialize_datetime -from ..resources.a.types.a import A +from .a.a import A +from .core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/circular-references/src/seed/resources/__init__.py b/seed/sdk/circular-references/src/seed/resources/__init__.py deleted file mode 100644 index 9f6cd9695..000000000 --- a/seed/sdk/circular-references/src/seed/resources/__init__.py +++ /dev/null @@ -1,30 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import a, ast -from .a import A -from .ast import ( - ContainerValue, - ContainerValue_List, - ContainerValue_Optional, - FieldValue, - FieldValue_ContainerValue, - FieldValue_ObjectValue, - FieldValue_PrimitiveValue, - ObjectValue, - PrimitiveValue, -) - -__all__ = [ - "A", - "ContainerValue", - "ContainerValue_List", - "ContainerValue_Optional", - "FieldValue", - "FieldValue_ContainerValue", - "FieldValue_ObjectValue", - "FieldValue_PrimitiveValue", - "ObjectValue", - "PrimitiveValue", - "a", - "ast", -] diff --git a/seed/sdk/circular-references/src/seed/resources/ast/__init__.py b/seed/sdk/circular-references/src/seed/resources/ast/__init__.py deleted file mode 100644 index 88dc770e7..000000000 --- a/seed/sdk/circular-references/src/seed/resources/ast/__init__.py +++ /dev/null @@ -1,25 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - ContainerValue, - ContainerValue_List, - ContainerValue_Optional, - FieldValue, - FieldValue_ContainerValue, - FieldValue_ObjectValue, - FieldValue_PrimitiveValue, - ObjectValue, - PrimitiveValue, -) - -__all__ = [ - "ContainerValue", - "ContainerValue_List", - "ContainerValue_Optional", - "FieldValue", - "FieldValue_ContainerValue", - "FieldValue_ObjectValue", - "FieldValue_PrimitiveValue", - "ObjectValue", - "PrimitiveValue", -] diff --git a/seed/sdk/circular-references/src/seed/types/root_type.py b/seed/sdk/circular-references/src/seed/root_type.py similarity index 93% rename from seed/sdk/circular-references/src/seed/types/root_type.py rename to seed/sdk/circular-references/src/seed/root_type.py index 271c56237..7254daf67 100644 --- a/seed/sdk/circular-references/src/seed/types/root_type.py +++ b/seed/sdk/circular-references/src/seed/root_type.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ..core.datetime_utils import serialize_datetime +from .core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/circular-references/src/seed/types/__init__.py b/seed/sdk/circular-references/src/seed/types/__init__.py deleted file mode 100644 index 85619eb65..000000000 --- a/seed/sdk/circular-references/src/seed/types/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .importing_a import ImportingA -from .root_type import RootType - -__all__ = ["ImportingA", "RootType"] diff --git a/seed/sdk/custom-auth/src/seed/__init__.py b/seed/sdk/custom-auth/src/seed/__init__.py index 7fc678041..89987c94c 100644 --- a/seed/sdk/custom-auth/src/seed/__init__.py +++ b/seed/sdk/custom-auth/src/seed/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import BadRequest, UnauthorizedRequest, UnauthorizedRequestErrorBody, custom_auth, errors +from .errors import BadRequest, UnauthorizedRequest, UnauthorizedRequestErrorBody +from . import custom_auth, errors __all__ = ["BadRequest", "UnauthorizedRequest", "UnauthorizedRequestErrorBody", "custom_auth", "errors"] diff --git a/seed/sdk/custom-auth/src/seed/client.py b/seed/sdk/custom-auth/src/seed/client.py index 16b02b4e1..2e325b3a6 100644 --- a/seed/sdk/custom-auth/src/seed/client.py +++ b/seed/sdk/custom-auth/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.custom_auth.client import AsyncCustomAuthClient, CustomAuthClient +from .custom_auth._client import AsyncCustomAuthClient, CustomAuthClient class SeedCustomAuth: diff --git a/seed/sdk/error-property/src/seed/resources/property_based_error/__init__.py b/seed/sdk/custom-auth/src/seed/custom_auth/__init__.py similarity index 100% rename from seed/sdk/error-property/src/seed/resources/property_based_error/__init__.py rename to seed/sdk/custom-auth/src/seed/custom_auth/__init__.py diff --git a/seed/sdk/custom-auth/src/seed/resources/custom_auth/client.py b/seed/sdk/custom-auth/src/seed/custom_auth/_client.py similarity index 92% rename from seed/sdk/custom-auth/src/seed/resources/custom_auth/client.py rename to seed/sdk/custom-auth/src/seed/custom_auth/_client.py index cafb9b492..27a9c03fc 100644 --- a/seed/sdk/custom-auth/src/seed/resources/custom_auth/client.py +++ b/seed/sdk/custom-auth/src/seed/custom_auth/_client.py @@ -4,12 +4,12 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..errors.errors.bad_request import BadRequest -from ..errors.errors.unauthorized_request import UnauthorizedRequest -from ..errors.types.unauthorized_request_error_body import UnauthorizedRequestErrorBody +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..errors.bad_request import BadRequest +from ..errors.unauthorized_request import UnauthorizedRequest +from ..errors.unauthorized_request_error_body import UnauthorizedRequestErrorBody try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/custom-auth/src/seed/resources/errors/errors/__init__.py b/seed/sdk/custom-auth/src/seed/errors/__init__.py similarity index 50% rename from seed/sdk/custom-auth/src/seed/resources/errors/errors/__init__.py rename to seed/sdk/custom-auth/src/seed/errors/__init__.py index 3ec728060..319fce358 100644 --- a/seed/sdk/custom-auth/src/seed/resources/errors/errors/__init__.py +++ b/seed/sdk/custom-auth/src/seed/errors/__init__.py @@ -2,5 +2,6 @@ from .bad_request import BadRequest from .unauthorized_request import UnauthorizedRequest +from .unauthorized_request_error_body import UnauthorizedRequestErrorBody -__all__ = ["BadRequest", "UnauthorizedRequest"] +__all__ = ["BadRequest", "UnauthorizedRequest", "UnauthorizedRequestErrorBody"] diff --git a/seed/sdk/basic-auth/src/seed/resources/errors/errors/bad_request.py b/seed/sdk/custom-auth/src/seed/errors/bad_request.py similarity index 80% rename from seed/sdk/basic-auth/src/seed/resources/errors/errors/bad_request.py rename to seed/sdk/custom-auth/src/seed/errors/bad_request.py index b3953d6b0..4888e1a2b 100644 --- a/seed/sdk/basic-auth/src/seed/resources/errors/errors/bad_request.py +++ b/seed/sdk/custom-auth/src/seed/errors/bad_request.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.api_error import ApiError +from ..core.api_error import ApiError class BadRequest(ApiError): diff --git a/seed/sdk/custom-auth/src/seed/resources/errors/errors/unauthorized_request.py b/seed/sdk/custom-auth/src/seed/errors/unauthorized_request.py similarity index 64% rename from seed/sdk/custom-auth/src/seed/resources/errors/errors/unauthorized_request.py rename to seed/sdk/custom-auth/src/seed/errors/unauthorized_request.py index 50bb0aae4..8af082011 100644 --- a/seed/sdk/custom-auth/src/seed/resources/errors/errors/unauthorized_request.py +++ b/seed/sdk/custom-auth/src/seed/errors/unauthorized_request.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.api_error import ApiError -from ..types.unauthorized_request_error_body import UnauthorizedRequestErrorBody +from ..core.api_error import ApiError +from .unauthorized_request_error_body import UnauthorizedRequestErrorBody class UnauthorizedRequest(ApiError): diff --git a/seed/sdk/basic-auth/src/seed/resources/errors/types/unauthorized_request_error_body.py b/seed/sdk/custom-auth/src/seed/errors/unauthorized_request_error_body.py similarity index 93% rename from seed/sdk/basic-auth/src/seed/resources/errors/types/unauthorized_request_error_body.py rename to seed/sdk/custom-auth/src/seed/errors/unauthorized_request_error_body.py index 46a4b536e..726f1738b 100644 --- a/seed/sdk/basic-auth/src/seed/resources/errors/types/unauthorized_request_error_body.py +++ b/seed/sdk/custom-auth/src/seed/errors/unauthorized_request_error_body.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/custom-auth/src/seed/resources/__init__.py b/seed/sdk/custom-auth/src/seed/resources/__init__.py deleted file mode 100644 index 89987c94c..000000000 --- a/seed/sdk/custom-auth/src/seed/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .errors import BadRequest, UnauthorizedRequest, UnauthorizedRequestErrorBody -from . import custom_auth, errors - -__all__ = ["BadRequest", "UnauthorizedRequest", "UnauthorizedRequestErrorBody", "custom_auth", "errors"] diff --git a/seed/sdk/custom-auth/src/seed/resources/errors/__init__.py b/seed/sdk/custom-auth/src/seed/resources/errors/__init__.py deleted file mode 100644 index b32086d7c..000000000 --- a/seed/sdk/custom-auth/src/seed/resources/errors/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import UnauthorizedRequestErrorBody -from .errors import BadRequest, UnauthorizedRequest - -__all__ = ["BadRequest", "UnauthorizedRequest", "UnauthorizedRequestErrorBody"] diff --git a/seed/sdk/custom-auth/src/seed/resources/errors/types/__init__.py b/seed/sdk/custom-auth/src/seed/resources/errors/types/__init__.py deleted file mode 100644 index c21167244..000000000 --- a/seed/sdk/custom-auth/src/seed/resources/errors/types/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .unauthorized_request_error_body import UnauthorizedRequestErrorBody - -__all__ = ["UnauthorizedRequestErrorBody"] diff --git a/seed/sdk/enum-query-params/src/seed/__init__.py b/seed/sdk/enum-query-params/src/seed/__init__.py index 92bd1ee47..427098850 100644 --- a/seed/sdk/enum-query-params/src/seed/__init__.py +++ b/seed/sdk/enum-query-params/src/seed/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import MyEnum, svc +from . import svc +from .svc import MyEnum __all__ = ["MyEnum", "svc"] diff --git a/seed/sdk/enum-query-params/src/seed/client.py b/seed/sdk/enum-query-params/src/seed/client.py index 8c18a05fe..f78501e2d 100644 --- a/seed/sdk/enum-query-params/src/seed/client.py +++ b/seed/sdk/enum-query-params/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.svc.client import AsyncSvcClient, SvcClient +from .svc._client import AsyncSvcClient, SvcClient class SeedApi: diff --git a/seed/sdk/enum-query-params/src/seed/resources/__init__.py b/seed/sdk/enum-query-params/src/seed/resources/__init__.py deleted file mode 100644 index 427098850..000000000 --- a/seed/sdk/enum-query-params/src/seed/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import svc -from .svc import MyEnum - -__all__ = ["MyEnum", "svc"] diff --git a/seed/sdk/enum-query-params/src/seed/resources/svc/__init__.py b/seed/sdk/enum-query-params/src/seed/resources/svc/__init__.py deleted file mode 100644 index c9617e634..000000000 --- a/seed/sdk/enum-query-params/src/seed/resources/svc/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import MyEnum - -__all__ = ["MyEnum"] diff --git a/seed/sdk/enum-query-params/src/seed/resources/svc/types/__init__.py b/seed/sdk/enum-query-params/src/seed/svc/__init__.py similarity index 100% rename from seed/sdk/enum-query-params/src/seed/resources/svc/types/__init__.py rename to seed/sdk/enum-query-params/src/seed/svc/__init__.py diff --git a/seed/sdk/enum-query-params/src/seed/resources/svc/client.py b/seed/sdk/enum-query-params/src/seed/svc/_client.py similarity index 91% rename from seed/sdk/enum-query-params/src/seed/resources/svc/client.py rename to seed/sdk/enum-query-params/src/seed/svc/_client.py index 4aef33cc4..b181d42dc 100644 --- a/seed/sdk/enum-query-params/src/seed/resources/svc/client.py +++ b/seed/sdk/enum-query-params/src/seed/svc/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.remove_none_from_dict import remove_none_from_dict -from .types.my_enum import MyEnum +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.remove_none_from_dict import remove_none_from_dict +from .my_enum import MyEnum try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/enum-query-params/src/seed/resources/svc/types/my_enum.py b/seed/sdk/enum-query-params/src/seed/svc/my_enum.py similarity index 100% rename from seed/sdk/enum-query-params/src/seed/resources/svc/types/my_enum.py rename to seed/sdk/enum-query-params/src/seed/svc/my_enum.py diff --git a/seed/sdk/error-property/src/seed/__init__.py b/seed/sdk/error-property/src/seed/__init__.py index 7378eafc1..779278fc9 100644 --- a/seed/sdk/error-property/src/seed/__init__.py +++ b/seed/sdk/error-property/src/seed/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import PropertyBasedErrorTest, PropertyBasedErrorTestBody, errors, property_based_error +from .errors import PropertyBasedErrorTest, PropertyBasedErrorTestBody +from . import errors, property_based_error __all__ = ["PropertyBasedErrorTest", "PropertyBasedErrorTestBody", "errors", "property_based_error"] diff --git a/seed/sdk/error-property/src/seed/client.py b/seed/sdk/error-property/src/seed/client.py index b089e6412..ddc28f318 100644 --- a/seed/sdk/error-property/src/seed/client.py +++ b/seed/sdk/error-property/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.property_based_error.client import AsyncPropertyBasedErrorClient, PropertyBasedErrorClient +from .property_based_error._client import AsyncPropertyBasedErrorClient, PropertyBasedErrorClient class SeedErrorProperty: diff --git a/seed/fastapi/error-property/resources/__init__.py b/seed/sdk/error-property/src/seed/errors/__init__.py similarity index 51% rename from seed/fastapi/error-property/resources/__init__.py rename to seed/sdk/error-property/src/seed/errors/__init__.py index bde766f1c..1ccbc1817 100644 --- a/seed/fastapi/error-property/resources/__init__.py +++ b/seed/sdk/error-property/src/seed/errors/__init__.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from . import errors -from .errors import PropertyBasedErrorTest, PropertyBasedErrorTestBody +from .property_based_error_test import PropertyBasedErrorTest +from .property_based_error_test_body import PropertyBasedErrorTestBody -__all__ = ["PropertyBasedErrorTest", "PropertyBasedErrorTestBody", "errors"] +__all__ = ["PropertyBasedErrorTest", "PropertyBasedErrorTestBody"] diff --git a/seed/sdk/error-property/src/seed/resources/errors/errors/property_based_error_test.py b/seed/sdk/error-property/src/seed/errors/property_based_error_test.py similarity index 64% rename from seed/sdk/error-property/src/seed/resources/errors/errors/property_based_error_test.py rename to seed/sdk/error-property/src/seed/errors/property_based_error_test.py index 1f00ce73b..1e22dc4ed 100644 --- a/seed/sdk/error-property/src/seed/resources/errors/errors/property_based_error_test.py +++ b/seed/sdk/error-property/src/seed/errors/property_based_error_test.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.api_error import ApiError -from ..types.property_based_error_test_body import PropertyBasedErrorTestBody +from ..core.api_error import ApiError +from .property_based_error_test_body import PropertyBasedErrorTestBody class PropertyBasedErrorTest(ApiError): diff --git a/seed/sdk/error-property/src/seed/resources/errors/types/property_based_error_test_body.py b/seed/sdk/error-property/src/seed/errors/property_based_error_test_body.py similarity index 93% rename from seed/sdk/error-property/src/seed/resources/errors/types/property_based_error_test_body.py rename to seed/sdk/error-property/src/seed/errors/property_based_error_test_body.py index ddf53f965..d9f22b5b0 100644 --- a/seed/sdk/error-property/src/seed/resources/errors/types/property_based_error_test_body.py +++ b/seed/sdk/error-property/src/seed/errors/property_based_error_test_body.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/file/resources/notification/resources/service/__init__.py b/seed/sdk/error-property/src/seed/property_based_error/__init__.py similarity index 100% rename from seed/sdk/examples/src/seed/resources/file/resources/notification/resources/service/__init__.py rename to seed/sdk/error-property/src/seed/property_based_error/__init__.py diff --git a/seed/sdk/error-property/src/seed/resources/property_based_error/client.py b/seed/sdk/error-property/src/seed/property_based_error/_client.py similarity index 90% rename from seed/sdk/error-property/src/seed/resources/property_based_error/client.py rename to seed/sdk/error-property/src/seed/property_based_error/_client.py index eb56436ba..61e03f6f7 100644 --- a/seed/sdk/error-property/src/seed/resources/property_based_error/client.py +++ b/seed/sdk/error-property/src/seed/property_based_error/_client.py @@ -3,10 +3,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ..errors.errors.property_based_error_test import PropertyBasedErrorTest -from ..errors.types.property_based_error_test_body import PropertyBasedErrorTestBody +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..errors.property_based_error_test import PropertyBasedErrorTest +from ..errors.property_based_error_test_body import PropertyBasedErrorTestBody try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/error-property/src/seed/resources/__init__.py b/seed/sdk/error-property/src/seed/resources/__init__.py deleted file mode 100644 index 779278fc9..000000000 --- a/seed/sdk/error-property/src/seed/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .errors import PropertyBasedErrorTest, PropertyBasedErrorTestBody -from . import errors, property_based_error - -__all__ = ["PropertyBasedErrorTest", "PropertyBasedErrorTestBody", "errors", "property_based_error"] diff --git a/seed/sdk/error-property/src/seed/resources/errors/__init__.py b/seed/sdk/error-property/src/seed/resources/errors/__init__.py deleted file mode 100644 index e88040025..000000000 --- a/seed/sdk/error-property/src/seed/resources/errors/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import PropertyBasedErrorTestBody -from .errors import PropertyBasedErrorTest - -__all__ = ["PropertyBasedErrorTest", "PropertyBasedErrorTestBody"] diff --git a/seed/sdk/error-property/src/seed/resources/errors/errors/__init__.py b/seed/sdk/error-property/src/seed/resources/errors/errors/__init__.py deleted file mode 100644 index c41bcbeb4..000000000 --- a/seed/sdk/error-property/src/seed/resources/errors/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .property_based_error_test import PropertyBasedErrorTest - -__all__ = ["PropertyBasedErrorTest"] diff --git a/seed/sdk/error-property/src/seed/resources/errors/types/__init__.py b/seed/sdk/error-property/src/seed/resources/errors/types/__init__.py deleted file mode 100644 index ecc5346ad..000000000 --- a/seed/sdk/error-property/src/seed/resources/errors/types/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .property_based_error_test_body import PropertyBasedErrorTestBody - -__all__ = ["PropertyBasedErrorTestBody"] diff --git a/seed/sdk/examples/snippet.json b/seed/sdk/examples/snippet.json index 646f94fb4..93b1007d1 100644 --- a/seed/sdk/examples/snippet.json +++ b/seed/sdk/examples/snippet.json @@ -1,9 +1,9 @@ { "types": { "type_commons/types:Tag": "\"tag-wf9as23d\"\n", - "type_commons/types:Metadata": "from seed.resources.commons import Metadata\n\nMetadata(\n id=\"metadata-js8dg24b\",\n data={\"foo\": \"bar\", \"baz\": \"qux\"},\n json_string='{\"foo\": \"bar\", \"baz\": \"qux\"}',\n)\n", - "type_commons/types:EventInfo": "from seed.resources.commons import EventInfo_Metadata\n\nEventInfo_Metadata(\n type=\"metadata\",\n id=\"metadata-alskjfg8\",\n data={\"one\": \"two\"},\n json_string='{\"one\": \"two\"}',\n)\n", - "type_commons/types:Data": "from seed.resources.commons import Data_String\n\nData_String(type=\"string\", value=\"data\")\n", + "type_commons/types:Metadata": "from seed.commons import Metadata\n\nMetadata(\n id=\"metadata-js8dg24b\",\n data={\"foo\": \"bar\", \"baz\": \"qux\"},\n json_string='{\"foo\": \"bar\", \"baz\": \"qux\"}',\n)\n", + "type_commons/types:EventInfo": "from seed.commons import EventInfo_Metadata\n\nEventInfo_Metadata(\n type=\"metadata\",\n id=\"metadata-alskjfg8\",\n data={\"one\": \"two\"},\n json_string='{\"one\": \"two\"}',\n)\n", + "type_commons/types:Data": "from seed.commons import Data_String\n\nData_String(type=\"string\", value=\"data\")\n", "type_file/service:Filename": "\"file.txt\"\n", "type_types:MovieId": "\"movie-c06a4ad7\"\n", "type_types:Movie": "from seed import Movie\n\nMovie(\n id=\"movie-c06a4ad7\",\n title=\"The Boy and the Heron\",\n from_=\"Hayao Miyazaki\",\n rating=8.0,\n type=\"movie\",\n tag=\"tag-wf9as23d\",\n)\n", diff --git a/seed/sdk/examples/src/seed/__init__.py b/seed/sdk/examples/src/seed/__init__.py index 0f2c0be27..f7588aabf 100644 --- a/seed/sdk/examples/src/seed/__init__.py +++ b/seed/sdk/examples/src/seed/__init__.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import ( +from .types import ( Actor, Actress, CastMember, @@ -28,12 +28,8 @@ Test_And, Test_Or, Tree, - commons, - file, - health, - service, - types, ) +from . import commons, file, health, service, types from .environment import SeedExamplesEnvironment __all__ = [ diff --git a/seed/sdk/examples/src/seed/client.py b/seed/sdk/examples/src/seed/client.py index c0b7c43a1..716a61fbc 100644 --- a/seed/sdk/examples/src/seed/client.py +++ b/seed/sdk/examples/src/seed/client.py @@ -9,9 +9,9 @@ from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper from .core.jsonable_encoder import jsonable_encoder from .environment import SeedExamplesEnvironment -from .resources.file.client import AsyncFileClient, FileClient -from .resources.health.client import AsyncHealthClient, HealthClient -from .resources.service.client import AsyncServiceClient, ServiceClient +from .file._client import AsyncFileClient, FileClient +from .health._client import AsyncHealthClient, HealthClient +from .service._client import AsyncServiceClient, ServiceClient try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/commons/resources/__init__.py b/seed/sdk/examples/src/seed/commons/__init__.py similarity index 100% rename from seed/sdk/examples/src/seed/resources/commons/resources/__init__.py rename to seed/sdk/examples/src/seed/commons/__init__.py diff --git a/seed/sdk/examples/src/seed/resources/commons/resources/types/types/__init__.py b/seed/sdk/examples/src/seed/commons/types/__init__.py similarity index 100% rename from seed/sdk/examples/src/seed/resources/commons/resources/types/types/__init__.py rename to seed/sdk/examples/src/seed/commons/types/__init__.py diff --git a/seed/sdk/examples/src/seed/resources/commons/resources/types/types/data.py b/seed/sdk/examples/src/seed/commons/types/data.py similarity index 93% rename from seed/sdk/examples/src/seed/resources/commons/resources/types/types/data.py rename to seed/sdk/examples/src/seed/commons/types/data.py index 0d562db5c..f5c56de87 100644 --- a/seed/sdk/examples/src/seed/resources/commons/resources/types/types/data.py +++ b/seed/sdk/examples/src/seed/commons/types/data.py @@ -31,7 +31,7 @@ class Config: """ -from seed.resources.commons import Data_String +from seed.commons import Data_String Data_String(type="string", value="data") """ diff --git a/seed/sdk/examples/src/seed/resources/commons/resources/types/types/event_info.py b/seed/sdk/examples/src/seed/commons/types/event_info.py similarity index 94% rename from seed/sdk/examples/src/seed/resources/commons/resources/types/types/event_info.py rename to seed/sdk/examples/src/seed/commons/types/event_info.py index bb0873121..9f563a5ca 100644 --- a/seed/sdk/examples/src/seed/resources/commons/resources/types/types/event_info.py +++ b/seed/sdk/examples/src/seed/commons/types/event_info.py @@ -34,7 +34,7 @@ class Config: """ -from seed.resources.commons import EventInfo_Metadata +from seed.commons import EventInfo_Metadata EventInfo_Metadata( type="metadata", diff --git a/seed/sdk/examples/src/seed/resources/commons/resources/types/types/metadata.py b/seed/sdk/examples/src/seed/commons/types/metadata.py similarity index 91% rename from seed/sdk/examples/src/seed/resources/commons/resources/types/types/metadata.py rename to seed/sdk/examples/src/seed/commons/types/metadata.py index 972591a1d..390822bd5 100644 --- a/seed/sdk/examples/src/seed/resources/commons/resources/types/types/metadata.py +++ b/seed/sdk/examples/src/seed/commons/types/metadata.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore @@ -13,7 +13,7 @@ class Metadata(pydantic.BaseModel): """ - from seed.resources.commons import Metadata + from seed.commons import Metadata Metadata( id="metadata-js8dg24b", diff --git a/seed/sdk/examples/src/seed/resources/commons/resources/types/types/tag.py b/seed/sdk/examples/src/seed/commons/types/tag.py similarity index 100% rename from seed/sdk/examples/src/seed/resources/commons/resources/types/types/tag.py rename to seed/sdk/examples/src/seed/commons/types/tag.py diff --git a/seed/sdk/examples/src/seed/resources/file/resources/__init__.py b/seed/sdk/examples/src/seed/file/__init__.py similarity index 100% rename from seed/sdk/examples/src/seed/resources/file/resources/__init__.py rename to seed/sdk/examples/src/seed/file/__init__.py diff --git a/seed/sdk/examples/src/seed/resources/file/client.py b/seed/sdk/examples/src/seed/file/_client.py similarity index 73% rename from seed/sdk/examples/src/seed/resources/file/client.py rename to seed/sdk/examples/src/seed/file/_client.py index faeb430ca..aecbc634b 100644 --- a/seed/sdk/examples/src/seed/resources/file/client.py +++ b/seed/sdk/examples/src/seed/file/_client.py @@ -1,8 +1,8 @@ # This file was auto-generated by Fern from our API Definition. -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.notification.client import AsyncNotificationClient, NotificationClient -from .resources.service.client import AsyncServiceClient, ServiceClient +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .notification._client import AsyncNotificationClient, NotificationClient +from .service._client import AsyncServiceClient, ServiceClient class FileClient: diff --git a/seed/sdk/api-wide-base-path/src/seed/resources/__init__.py b/seed/sdk/examples/src/seed/file/notification/__init__.py similarity index 100% rename from seed/sdk/api-wide-base-path/src/seed/resources/__init__.py rename to seed/sdk/examples/src/seed/file/notification/__init__.py diff --git a/seed/sdk/examples/src/seed/resources/health/client.py b/seed/sdk/examples/src/seed/file/notification/_client.py similarity index 81% rename from seed/sdk/examples/src/seed/resources/health/client.py rename to seed/sdk/examples/src/seed/file/notification/_client.py index 8f07dd4ba..02d9d3e1d 100644 --- a/seed/sdk/examples/src/seed/resources/health/client.py +++ b/seed/sdk/examples/src/seed/file/notification/_client.py @@ -1,16 +1,16 @@ # This file was auto-generated by Fern from our API Definition. from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.service.client import AsyncServiceClient, ServiceClient +from .service._client import AsyncServiceClient, ServiceClient -class HealthClient: +class NotificationClient: def __init__(self, *, client_wrapper: SyncClientWrapper): self._client_wrapper = client_wrapper self.service = ServiceClient(client_wrapper=self._client_wrapper) -class AsyncHealthClient: +class AsyncNotificationClient: def __init__(self, *, client_wrapper: AsyncClientWrapper): self._client_wrapper = client_wrapper self.service = AsyncServiceClient(client_wrapper=self._client_wrapper) diff --git a/seed/sdk/examples/src/seed/resources/health/resources/service/__init__.py b/seed/sdk/examples/src/seed/file/notification/service/__init__.py similarity index 100% rename from seed/sdk/examples/src/seed/resources/health/resources/service/__init__.py rename to seed/sdk/examples/src/seed/file/notification/service/__init__.py diff --git a/seed/sdk/examples/src/seed/resources/file/resources/notification/resources/service/client.py b/seed/sdk/examples/src/seed/file/notification/service/_client.py similarity index 94% rename from seed/sdk/examples/src/seed/resources/file/resources/notification/resources/service/client.py rename to seed/sdk/examples/src/seed/file/notification/service/_client.py index 6fcf9f3b9..6a7363ca5 100644 --- a/seed/sdk/examples/src/seed/resources/file/resources/notification/resources/service/client.py +++ b/seed/sdk/examples/src/seed/file/notification/service/_client.py @@ -3,9 +3,9 @@ import urllib.parse from json.decoder import JSONDecodeError -from .......core.api_error import ApiError -from .......core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ......types.types.exception import Exception +from ....core.api_error import ApiError +from ....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ....types.exception import Exception try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/file/resources/service/types/__init__.py b/seed/sdk/examples/src/seed/file/service/__init__.py similarity index 100% rename from seed/sdk/examples/src/seed/resources/file/resources/service/types/__init__.py rename to seed/sdk/examples/src/seed/file/service/__init__.py diff --git a/seed/sdk/examples/src/seed/resources/file/resources/service/client.py b/seed/sdk/examples/src/seed/file/service/_client.py similarity index 92% rename from seed/sdk/examples/src/seed/resources/file/resources/service/client.py rename to seed/sdk/examples/src/seed/file/service/_client.py index f5999a436..a1e6a4da2 100644 --- a/seed/sdk/examples/src/seed/resources/file/resources/service/client.py +++ b/seed/sdk/examples/src/seed/file/service/_client.py @@ -3,11 +3,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.remove_none_from_dict import remove_none_from_dict -from ....types.errors.not_found_error import NotFoundError -from ....types.types.file import File +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.remove_none_from_dict import remove_none_from_dict +from ...types.file import File +from ...types.not_found_error import NotFoundError try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/file/resources/service/types/filename.py b/seed/sdk/examples/src/seed/file/service/filename.py similarity index 100% rename from seed/sdk/examples/src/seed/resources/file/resources/service/types/filename.py rename to seed/sdk/examples/src/seed/file/service/filename.py diff --git a/seed/sdk/auth-environment-variables/src/seed/resources/__init__.py b/seed/sdk/examples/src/seed/health/__init__.py similarity index 100% rename from seed/sdk/auth-environment-variables/src/seed/resources/__init__.py rename to seed/sdk/examples/src/seed/health/__init__.py diff --git a/seed/sdk/examples/src/seed/resources/file/resources/notification/client.py b/seed/sdk/examples/src/seed/health/_client.py similarity index 68% rename from seed/sdk/examples/src/seed/resources/file/resources/notification/client.py rename to seed/sdk/examples/src/seed/health/_client.py index 578295a71..29592d315 100644 --- a/seed/sdk/examples/src/seed/resources/file/resources/notification/client.py +++ b/seed/sdk/examples/src/seed/health/_client.py @@ -1,16 +1,16 @@ # This file was auto-generated by Fern from our API Definition. -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.service.client import AsyncServiceClient, ServiceClient +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .service._client import AsyncServiceClient, ServiceClient -class NotificationClient: +class HealthClient: def __init__(self, *, client_wrapper: SyncClientWrapper): self._client_wrapper = client_wrapper self.service = ServiceClient(client_wrapper=self._client_wrapper) -class AsyncNotificationClient: +class AsyncHealthClient: def __init__(self, *, client_wrapper: AsyncClientWrapper): self._client_wrapper = client_wrapper self.service = AsyncServiceClient(client_wrapper=self._client_wrapper) diff --git a/seed/sdk/examples/src/seed/resources/service/__init__.py b/seed/sdk/examples/src/seed/health/service/__init__.py similarity index 100% rename from seed/sdk/examples/src/seed/resources/service/__init__.py rename to seed/sdk/examples/src/seed/health/service/__init__.py diff --git a/seed/sdk/examples/src/seed/resources/health/resources/service/client.py b/seed/sdk/examples/src/seed/health/service/_client.py similarity index 97% rename from seed/sdk/examples/src/seed/resources/health/resources/service/client.py rename to seed/sdk/examples/src/seed/health/service/_client.py index 8c2006308..f73bae4a1 100644 --- a/seed/sdk/examples/src/seed/resources/health/resources/service/client.py +++ b/seed/sdk/examples/src/seed/health/service/_client.py @@ -3,8 +3,8 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/__init__.py b/seed/sdk/examples/src/seed/resources/__init__.py deleted file mode 100644 index 332c7ee8e..000000000 --- a/seed/sdk/examples/src/seed/resources/__init__.py +++ /dev/null @@ -1,67 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - Actor, - Actress, - CastMember, - Directory, - Exception, - ExceptionInfo, - Exception_Generic, - Exception_Timeout, - ExtendedMovie, - File, - Metadata, - Metadata_Html, - Metadata_Markdown, - Migration, - MigrationStatus, - Moment, - Movie, - MovieId, - Node, - NotFoundError, - Request, - Response, - StuntDouble, - Test, - Test_And, - Test_Or, - Tree, -) -from . import commons, file, health, service, types - -__all__ = [ - "Actor", - "Actress", - "CastMember", - "Directory", - "Exception", - "ExceptionInfo", - "Exception_Generic", - "Exception_Timeout", - "ExtendedMovie", - "File", - "Metadata", - "Metadata_Html", - "Metadata_Markdown", - "Migration", - "MigrationStatus", - "Moment", - "Movie", - "MovieId", - "Node", - "NotFoundError", - "Request", - "Response", - "StuntDouble", - "Test", - "Test_And", - "Test_Or", - "Tree", - "commons", - "file", - "health", - "service", - "types", -] diff --git a/seed/sdk/examples/src/seed/resources/commons/__init__.py b/seed/sdk/examples/src/seed/resources/commons/__init__.py deleted file mode 100644 index c16652911..000000000 --- a/seed/sdk/examples/src/seed/resources/commons/__init__.py +++ /dev/null @@ -1,25 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import ( - Data, - Data_Base64, - Data_String, - EventInfo, - EventInfo_Metadata, - EventInfo_Tag, - Metadata, - Tag, - types, -) - -__all__ = [ - "Data", - "Data_Base64", - "Data_String", - "EventInfo", - "EventInfo_Metadata", - "EventInfo_Tag", - "Metadata", - "Tag", - "types", -] diff --git a/seed/sdk/examples/src/seed/resources/commons/resources/types/__init__.py b/seed/sdk/examples/src/seed/resources/commons/resources/types/__init__.py deleted file mode 100644 index 319c40f2c..000000000 --- a/seed/sdk/examples/src/seed/resources/commons/resources/types/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Data, Data_Base64, Data_String, EventInfo, EventInfo_Metadata, EventInfo_Tag, Metadata, Tag - -__all__ = ["Data", "Data_Base64", "Data_String", "EventInfo", "EventInfo_Metadata", "EventInfo_Tag", "Metadata", "Tag"] diff --git a/seed/sdk/examples/src/seed/resources/file/__init__.py b/seed/sdk/examples/src/seed/resources/file/__init__.py deleted file mode 100644 index cd94a474e..000000000 --- a/seed/sdk/examples/src/seed/resources/file/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import Filename, notification, service - -__all__ = ["Filename", "notification", "service"] diff --git a/seed/sdk/examples/src/seed/resources/file/resources/notification/__init__.py b/seed/sdk/examples/src/seed/resources/file/resources/notification/__init__.py deleted file mode 100644 index e2f27dfce..000000000 --- a/seed/sdk/examples/src/seed/resources/file/resources/notification/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import service - -__all__ = ["service"] diff --git a/seed/sdk/examples/src/seed/resources/file/resources/notification/resources/__init__.py b/seed/sdk/examples/src/seed/resources/file/resources/notification/resources/__init__.py deleted file mode 100644 index 43ae725f5..000000000 --- a/seed/sdk/examples/src/seed/resources/file/resources/notification/resources/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import service - -__all__ = ["service"] diff --git a/seed/sdk/examples/src/seed/resources/file/resources/service/__init__.py b/seed/sdk/examples/src/seed/resources/file/resources/service/__init__.py deleted file mode 100644 index c882776e5..000000000 --- a/seed/sdk/examples/src/seed/resources/file/resources/service/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Filename - -__all__ = ["Filename"] diff --git a/seed/sdk/examples/src/seed/resources/health/__init__.py b/seed/sdk/examples/src/seed/resources/health/__init__.py deleted file mode 100644 index e2f27dfce..000000000 --- a/seed/sdk/examples/src/seed/resources/health/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import service - -__all__ = ["service"] diff --git a/seed/sdk/examples/src/seed/resources/health/resources/__init__.py b/seed/sdk/examples/src/seed/resources/health/resources/__init__.py deleted file mode 100644 index 43ae725f5..000000000 --- a/seed/sdk/examples/src/seed/resources/health/resources/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import service - -__all__ = ["service"] diff --git a/seed/sdk/examples/src/seed/resources/types/__init__.py b/seed/sdk/examples/src/seed/resources/types/__init__.py deleted file mode 100644 index d35aa146a..000000000 --- a/seed/sdk/examples/src/seed/resources/types/__init__.py +++ /dev/null @@ -1,61 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - Actor, - Actress, - CastMember, - Directory, - Exception, - ExceptionInfo, - Exception_Generic, - Exception_Timeout, - ExtendedMovie, - File, - Metadata, - Metadata_Html, - Metadata_Markdown, - Migration, - MigrationStatus, - Moment, - Movie, - MovieId, - Node, - Request, - Response, - StuntDouble, - Test, - Test_And, - Test_Or, - Tree, -) -from .errors import NotFoundError - -__all__ = [ - "Actor", - "Actress", - "CastMember", - "Directory", - "Exception", - "ExceptionInfo", - "Exception_Generic", - "Exception_Timeout", - "ExtendedMovie", - "File", - "Metadata", - "Metadata_Html", - "Metadata_Markdown", - "Migration", - "MigrationStatus", - "Moment", - "Movie", - "MovieId", - "Node", - "NotFoundError", - "Request", - "Response", - "StuntDouble", - "Test", - "Test_And", - "Test_Or", - "Tree", -] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/container/__init__.py b/seed/sdk/examples/src/seed/service/__init__.py similarity index 100% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/container/__init__.py rename to seed/sdk/examples/src/seed/service/__init__.py diff --git a/seed/sdk/examples/src/seed/resources/service/client.py b/seed/sdk/examples/src/seed/service/_client.py similarity index 96% rename from seed/sdk/examples/src/seed/resources/service/client.py rename to seed/sdk/examples/src/seed/service/_client.py index bc4783e94..536f84059 100644 --- a/seed/sdk/examples/src/seed/resources/service/client.py +++ b/seed/sdk/examples/src/seed/service/_client.py @@ -4,13 +4,13 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ...core.remove_none_from_dict import remove_none_from_dict -from ..types.types.metadata import Metadata -from ..types.types.movie import Movie -from ..types.types.movie_id import MovieId +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..core.remove_none_from_dict import remove_none_from_dict +from ..types.metadata import Metadata +from ..types.movie import Movie +from ..types.movie_id import MovieId try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/types/types/__init__.py b/seed/sdk/examples/src/seed/types/__init__.py similarity index 95% rename from seed/sdk/examples/src/seed/resources/types/types/__init__.py rename to seed/sdk/examples/src/seed/types/__init__.py index 28b5a6988..9cc558e60 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/__init__.py +++ b/seed/sdk/examples/src/seed/types/__init__.py @@ -15,6 +15,7 @@ from .movie import Movie from .movie_id import MovieId from .node import Node +from .not_found_error import NotFoundError from .request import Request from .response import Response from .stunt_double import StuntDouble @@ -41,6 +42,7 @@ "Movie", "MovieId", "Node", + "NotFoundError", "Request", "Response", "StuntDouble", diff --git a/seed/sdk/examples/src/seed/resources/types/types/actor.py b/seed/sdk/examples/src/seed/types/actor.py similarity index 93% rename from seed/sdk/examples/src/seed/resources/types/types/actor.py rename to seed/sdk/examples/src/seed/types/actor.py index 907c7f521..13194f893 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/actor.py +++ b/seed/sdk/examples/src/seed/types/actor.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/types/types/actress.py b/seed/sdk/examples/src/seed/types/actress.py similarity index 94% rename from seed/sdk/examples/src/seed/resources/types/types/actress.py rename to seed/sdk/examples/src/seed/types/actress.py index e8d54f5e5..8682797bf 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/actress.py +++ b/seed/sdk/examples/src/seed/types/actress.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/types/types/cast_member.py b/seed/sdk/examples/src/seed/types/cast_member.py similarity index 100% rename from seed/sdk/examples/src/seed/resources/types/types/cast_member.py rename to seed/sdk/examples/src/seed/types/cast_member.py diff --git a/seed/sdk/examples/src/seed/resources/types/types/directory.py b/seed/sdk/examples/src/seed/types/directory.py similarity index 96% rename from seed/sdk/examples/src/seed/resources/types/types/directory.py rename to seed/sdk/examples/src/seed/types/directory.py index 2e29217dc..5ba6b8b8c 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/directory.py +++ b/seed/sdk/examples/src/seed/types/directory.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .file import File try: diff --git a/seed/sdk/examples/src/seed/resources/types/types/exception.py b/seed/sdk/examples/src/seed/types/exception.py similarity index 100% rename from seed/sdk/examples/src/seed/resources/types/types/exception.py rename to seed/sdk/examples/src/seed/types/exception.py diff --git a/seed/sdk/examples/src/seed/resources/types/types/exception_info.py b/seed/sdk/examples/src/seed/types/exception_info.py similarity index 95% rename from seed/sdk/examples/src/seed/resources/types/types/exception_info.py rename to seed/sdk/examples/src/seed/types/exception_info.py index d202ff8af..981551935 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/exception_info.py +++ b/seed/sdk/examples/src/seed/types/exception_info.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/types/types/extended_movie.py b/seed/sdk/examples/src/seed/types/extended_movie.py similarity index 95% rename from seed/sdk/examples/src/seed/resources/types/types/extended_movie.py rename to seed/sdk/examples/src/seed/types/extended_movie.py index df10fe4f5..174ee9f25 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/extended_movie.py +++ b/seed/sdk/examples/src/seed/types/extended_movie.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .movie import Movie diff --git a/seed/sdk/examples/src/seed/resources/types/types/file.py b/seed/sdk/examples/src/seed/types/file.py similarity index 94% rename from seed/sdk/examples/src/seed/resources/types/types/file.py rename to seed/sdk/examples/src/seed/types/file.py index a24952eec..873b50dd4 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/file.py +++ b/seed/sdk/examples/src/seed/types/file.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/types/types/metadata.py b/seed/sdk/examples/src/seed/types/metadata.py similarity index 96% rename from seed/sdk/examples/src/seed/resources/types/types/metadata.py rename to seed/sdk/examples/src/seed/types/metadata.py index 458f737e9..8ea1e7e14 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/metadata.py +++ b/seed/sdk/examples/src/seed/types/metadata.py @@ -7,7 +7,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/types/types/migration.py b/seed/sdk/examples/src/seed/types/migration.py similarity index 94% rename from seed/sdk/examples/src/seed/resources/types/types/migration.py rename to seed/sdk/examples/src/seed/types/migration.py index 009193f28..c64e93d5d 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/migration.py +++ b/seed/sdk/examples/src/seed/types/migration.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .migration_status import MigrationStatus try: diff --git a/seed/sdk/examples/src/seed/resources/types/types/migration_status.py b/seed/sdk/examples/src/seed/types/migration_status.py similarity index 100% rename from seed/sdk/examples/src/seed/resources/types/types/migration_status.py rename to seed/sdk/examples/src/seed/types/migration_status.py diff --git a/seed/sdk/examples/src/seed/resources/types/types/moment.py b/seed/sdk/examples/src/seed/types/moment.py similarity index 95% rename from seed/sdk/examples/src/seed/resources/types/types/moment.py rename to seed/sdk/examples/src/seed/types/moment.py index dc58aa08a..6ba4304f2 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/moment.py +++ b/seed/sdk/examples/src/seed/types/moment.py @@ -4,7 +4,7 @@ import typing import uuid -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/types/types/movie.py b/seed/sdk/examples/src/seed/types/movie.py similarity index 92% rename from seed/sdk/examples/src/seed/resources/types/types/movie.py rename to seed/sdk/examples/src/seed/types/movie.py index 8226edc9b..b140bf99e 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/movie.py +++ b/seed/sdk/examples/src/seed/types/movie.py @@ -5,8 +5,8 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime -from ...commons.resources.types.types.tag import Tag +from ..commons.types.tag import Tag +from ..core.datetime_utils import serialize_datetime from .movie_id import MovieId try: diff --git a/seed/sdk/examples/src/seed/resources/types/types/movie_id.py b/seed/sdk/examples/src/seed/types/movie_id.py similarity index 100% rename from seed/sdk/examples/src/seed/resources/types/types/movie_id.py rename to seed/sdk/examples/src/seed/types/movie_id.py diff --git a/seed/sdk/examples/src/seed/resources/types/types/node.py b/seed/sdk/examples/src/seed/types/node.py similarity index 96% rename from seed/sdk/examples/src/seed/resources/types/types/node.py rename to seed/sdk/examples/src/seed/types/node.py index 44b7f2fd7..0eb12037d 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/node.py +++ b/seed/sdk/examples/src/seed/types/node.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/types/errors/not_found_error.py b/seed/sdk/examples/src/seed/types/not_found_error.py similarity index 82% rename from seed/sdk/examples/src/seed/resources/types/errors/not_found_error.py rename to seed/sdk/examples/src/seed/types/not_found_error.py index 0ea913cea..16b6f2d47 100644 --- a/seed/sdk/examples/src/seed/resources/types/errors/not_found_error.py +++ b/seed/sdk/examples/src/seed/types/not_found_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.api_error import ApiError +from ..core.api_error import ApiError class NotFoundError(ApiError): diff --git a/seed/sdk/examples/src/seed/resources/types/types/request.py b/seed/sdk/examples/src/seed/types/request.py similarity index 94% rename from seed/sdk/examples/src/seed/resources/types/types/request.py rename to seed/sdk/examples/src/seed/types/request.py index 916c95fc0..60c6f9f7c 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/request.py +++ b/seed/sdk/examples/src/seed/types/request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/types/types/response.py b/seed/sdk/examples/src/seed/types/response.py similarity index 94% rename from seed/sdk/examples/src/seed/resources/types/types/response.py rename to seed/sdk/examples/src/seed/types/response.py index 0393f2a81..2743b6d86 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/response.py +++ b/seed/sdk/examples/src/seed/types/response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/types/types/stunt_double.py b/seed/sdk/examples/src/seed/types/stunt_double.py similarity index 94% rename from seed/sdk/examples/src/seed/resources/types/types/stunt_double.py rename to seed/sdk/examples/src/seed/types/stunt_double.py index 9c8cca6f3..88a867fbf 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/stunt_double.py +++ b/seed/sdk/examples/src/seed/types/stunt_double.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/examples/src/seed/resources/types/types/test.py b/seed/sdk/examples/src/seed/types/test.py similarity index 100% rename from seed/sdk/examples/src/seed/resources/types/types/test.py rename to seed/sdk/examples/src/seed/types/test.py diff --git a/seed/sdk/examples/src/seed/resources/types/types/tree.py b/seed/sdk/examples/src/seed/types/tree.py similarity index 95% rename from seed/sdk/examples/src/seed/resources/types/types/tree.py rename to seed/sdk/examples/src/seed/types/tree.py index 3c1ccaa5b..e6c4c4546 100644 --- a/seed/sdk/examples/src/seed/resources/types/types/tree.py +++ b/seed/sdk/examples/src/seed/types/tree.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/__init__.py index 3616a8644..3e6746abf 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/__init__.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/__init__.py @@ -1,16 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import ( - BadObjectRequestInfo, - BadRequestBody, - endpoints, - general_errors, - inlined_requests, - no_auth, - no_req_body, - req_with_headers, - types, -) +from . import endpoints, general_errors, inlined_requests, no_auth, no_req_body, req_with_headers, types +from .general_errors import BadObjectRequestInfo, BadRequestBody __all__ = [ "BadObjectRequestInfo", diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/client.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/client.py index dbf97215f..9c7c507a7 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/client.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/client.py @@ -5,11 +5,11 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.endpoints.client import AsyncEndpointsClient, EndpointsClient -from .resources.inlined_requests.client import AsyncInlinedRequestsClient, InlinedRequestsClient -from .resources.no_auth.client import AsyncNoAuthClient, NoAuthClient -from .resources.no_req_body.client import AsyncNoReqBodyClient, NoReqBodyClient -from .resources.req_with_headers.client import AsyncReqWithHeadersClient, ReqWithHeadersClient +from .endpoints._client import AsyncEndpointsClient, EndpointsClient +from .inlined_requests._client import AsyncInlinedRequestsClient, InlinedRequestsClient +from .no_auth._client import AsyncNoAuthClient, NoAuthClient +from .no_req_body._client import AsyncNoReqBodyClient, NoReqBodyClient +from .req_with_headers._client import AsyncReqWithHeadersClient, ReqWithHeadersClient class SeedExhaustive: diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/__init__.py similarity index 100% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/__init__.py diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/client.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/_client.py similarity index 71% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/client.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/_client.py index fcfbb5adb..c2222257a 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/client.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/_client.py @@ -1,13 +1,13 @@ # This file was auto-generated by Fern from our API Definition. -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.container.client import AsyncContainerClient, ContainerClient -from .resources.enum.client import AsyncEnumClient, EnumClient -from .resources.http_methods.client import AsyncHttpMethodsClient, HttpMethodsClient -from .resources.object.client import AsyncObjectClient, ObjectClient -from .resources.params.client import AsyncParamsClient, ParamsClient -from .resources.primitive.client import AsyncPrimitiveClient, PrimitiveClient -from .resources.union.client import AsyncUnionClient, UnionClient +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .container._client import AsyncContainerClient, ContainerClient +from .enum._client import AsyncEnumClient, EnumClient +from .http_methods._client import AsyncHttpMethodsClient, HttpMethodsClient +from .object._client import AsyncObjectClient, ObjectClient +from .params._client import AsyncParamsClient, ParamsClient +from .primitive._client import AsyncPrimitiveClient, PrimitiveClient +from .union._client import AsyncUnionClient, UnionClient class EndpointsClient: diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/enum/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/container/__init__.py similarity index 100% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/enum/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/container/__init__.py diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/container/client.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/container/_client.py similarity index 98% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/container/client.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/container/_client.py index 46f5a7bb5..a2be5eada 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/container/client.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/container/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/http_methods/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/enum/__init__.py similarity index 100% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/http_methods/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/enum/__init__.py diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/enum/client.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/enum/_client.py similarity index 90% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/enum/client.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/enum/_client.py index 3d170208d..1ba552101 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/enum/client.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/enum/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.enum.types.weather_report import WeatherReport +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.enum.weather_report import WeatherReport try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/object/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/http_methods/__init__.py similarity index 100% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/object/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/http_methods/__init__.py diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/http_methods/client.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/http_methods/_client.py similarity index 96% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/http_methods/client.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/http_methods/_client.py index 051512b1c..15069936f 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/http_methods/client.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/http_methods/_client.py @@ -4,11 +4,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.object_with_optional_field import ObjectWithOptionalField +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/params/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/object/__init__.py similarity index 100% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/params/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/object/__init__.py diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/object/client.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/object/_client.py similarity index 94% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/object/client.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/object/_client.py index 760ea1337..5ac79cc2b 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/object/client.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/object/_client.py @@ -4,14 +4,14 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.nested_object_with_optional_field import NestedObjectWithOptionalField -from ....types.resources.object.types.nested_object_with_required_field import NestedObjectWithRequiredField -from ....types.resources.object.types.object_with_map_of_map import ObjectWithMapOfMap -from ....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.nested_object_with_optional_field import NestedObjectWithOptionalField +from ...types.object.nested_object_with_required_field import NestedObjectWithRequiredField +from ...types.object.object_with_map_of_map import ObjectWithMapOfMap +from ...types.object.object_with_optional_field import ObjectWithOptionalField +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/primitive/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/params/__init__.py similarity index 100% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/primitive/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/params/__init__.py diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/params/client.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/params/_client.py similarity index 97% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/params/client.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/params/_client.py index 47d962b12..d795b6954 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/params/client.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/params/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from .....core.remove_none_from_dict import remove_none_from_dict +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...core.remove_none_from_dict import remove_none_from_dict try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/union/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/primitive/__init__.py similarity index 100% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/union/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/primitive/__init__.py diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/primitive/client.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/primitive/_client.py similarity index 98% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/primitive/client.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/primitive/_client.py index ddfff18ca..187a46616 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/primitive/client.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/primitive/_client.py @@ -6,9 +6,9 @@ import uuid from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/inlined_requests/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/union/__init__.py similarity index 100% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/inlined_requests/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/union/__init__.py diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/union/client.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/union/_client.py similarity index 90% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/union/client.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/union/_client.py index a69f568c8..073ca13a5 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/union/client.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/union/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.union.types.animal import Animal +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.union.animal import Animal try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/types/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/general_errors/__init__.py similarity index 55% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/types/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/general_errors/__init__.py index b6788a570..d34511a58 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/types/__init__.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/general_errors/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. from .bad_object_request_info import BadObjectRequestInfo +from .bad_request_body import BadRequestBody -__all__ = ["BadObjectRequestInfo"] +__all__ = ["BadObjectRequestInfo", "BadRequestBody"] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/types/bad_object_request_info.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/general_errors/bad_object_request_info.py similarity index 93% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/types/bad_object_request_info.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/general_errors/bad_object_request_info.py index 4efd8af31..9196a5146 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/types/bad_object_request_info.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/general_errors/bad_object_request_info.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/errors/bad_request_body.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/general_errors/bad_request_body.py similarity index 66% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/errors/bad_request_body.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/general_errors/bad_request_body.py index 7ca134935..0305d0248 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/errors/bad_request_body.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/general_errors/bad_request_body.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.api_error import ApiError -from ..types.bad_object_request_info import BadObjectRequestInfo +from ..core.api_error import ApiError +from .bad_object_request_info import BadObjectRequestInfo class BadRequestBody(ApiError): diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/no_auth/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/inlined_requests/__init__.py similarity index 100% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/no_auth/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/inlined_requests/__init__.py diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/inlined_requests/client.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/inlined_requests/_client.py similarity index 88% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/inlined_requests/client.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/inlined_requests/_client.py index 18812cbbe..9e018544d 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/inlined_requests/client.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/inlined_requests/_client.py @@ -4,12 +4,12 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..general_errors.errors.bad_request_body import BadRequestBody -from ..general_errors.types.bad_object_request_info import BadObjectRequestInfo -from ..types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..general_errors.bad_object_request_info import BadObjectRequestInfo +from ..general_errors.bad_request_body import BadRequestBody +from ..types.object.object_with_optional_field import ObjectWithOptionalField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/no_req_body/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/no_auth/__init__.py similarity index 100% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/no_req_body/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/no_auth/__init__.py diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/no_auth/client.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/no_auth/_client.py similarity index 89% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/no_auth/client.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/no_auth/_client.py index 403e2b970..67749148f 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/no_auth/client.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/no_auth/_client.py @@ -4,11 +4,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..general_errors.errors.bad_request_body import BadRequestBody -from ..general_errors.types.bad_object_request_info import BadObjectRequestInfo +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..general_errors.bad_object_request_info import BadObjectRequestInfo +from ..general_errors.bad_request_body import BadRequestBody try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/req_with_headers/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/no_req_body/__init__.py similarity index 100% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/req_with_headers/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/no_req_body/__init__.py diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/no_req_body/client.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/no_req_body/_client.py similarity index 94% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/no_req_body/client.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/no_req_body/_client.py index cfa4368a2..c197615cb 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/no_req_body/client.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/no_req_body/_client.py @@ -3,9 +3,9 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ..types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..types.object.object_with_optional_field import ObjectWithOptionalField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/container/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/req_with_headers/__init__.py similarity index 100% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/container/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/req_with_headers/__init__.py diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/req_with_headers/client.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/req_with_headers/_client.py similarity index 92% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/req_with_headers/client.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/req_with_headers/_client.py index ae5753b73..869c570c7 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/req_with_headers/client.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/req_with_headers/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ...core.remove_none_from_dict import remove_none_from_dict +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..core.remove_none_from_dict import remove_none_from_dict # this is used as the default value for optional parameters OMIT = typing.cast(typing.Any, ...) diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/__init__.py deleted file mode 100644 index 3e6746abf..000000000 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import endpoints, general_errors, inlined_requests, no_auth, no_req_body, req_with_headers, types -from .general_errors import BadObjectRequestInfo, BadRequestBody - -__all__ = [ - "BadObjectRequestInfo", - "BadRequestBody", - "endpoints", - "general_errors", - "inlined_requests", - "no_auth", - "no_req_body", - "req_with_headers", - "types", -] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/__init__.py deleted file mode 100644 index 466c54f1d..000000000 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import container, enum, http_methods, object, params, primitive, union - -__all__ = ["container", "enum", "http_methods", "object", "params", "primitive", "union"] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/__init__.py deleted file mode 100644 index 57de0a862..000000000 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import BadObjectRequestInfo -from .errors import BadRequestBody - -__all__ = ["BadObjectRequestInfo", "BadRequestBody"] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/errors/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/errors/__init__.py deleted file mode 100644 index 04eaf8e38..000000000 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .bad_request_body import BadRequestBody - -__all__ = ["BadRequestBody"] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/__init__.py deleted file mode 100644 index b54f8fbcd..000000000 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/__init__.py +++ /dev/null @@ -1,47 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import ( - Animal, - Animal_Cat, - Animal_Dog, - Cat, - Dog, - ErrorWithEnumBody, - ErrorWithUnionBody, - NestedObjectWithOptionalField, - NestedObjectWithOptionalFieldError, - NestedObjectWithRequiredField, - NestedObjectWithRequiredFieldError, - ObjectWithMapOfMap, - ObjectWithOptionalField, - ObjectWithOptionalFieldError, - ObjectWithRequiredField, - ObjectWithRequiredFieldError, - WeatherReport, - enum, - object, - union, -) - -__all__ = [ - "Animal", - "Animal_Cat", - "Animal_Dog", - "Cat", - "Dog", - "ErrorWithEnumBody", - "ErrorWithUnionBody", - "NestedObjectWithOptionalField", - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredField", - "NestedObjectWithRequiredFieldError", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredField", - "ObjectWithRequiredFieldError", - "WeatherReport", - "enum", - "object", - "union", -] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/__init__.py deleted file mode 100644 index b1c48999a..000000000 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import WeatherReport -from .errors import ErrorWithEnumBody - -__all__ = ["ErrorWithEnumBody", "WeatherReport"] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/types/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/types/__init__.py deleted file mode 100644 index 7a47d1fef..000000000 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/types/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .weather_report import WeatherReport - -__all__ = ["WeatherReport"] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/__init__.py deleted file mode 100644 index 3b74145a2..000000000 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/__init__.py +++ /dev/null @@ -1,27 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - NestedObjectWithOptionalField, - NestedObjectWithRequiredField, - ObjectWithMapOfMap, - ObjectWithOptionalField, - ObjectWithRequiredField, -) -from .errors import ( - NestedObjectWithOptionalFieldError, - NestedObjectWithRequiredFieldError, - ObjectWithOptionalFieldError, - ObjectWithRequiredFieldError, -) - -__all__ = [ - "NestedObjectWithOptionalField", - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredField", - "NestedObjectWithRequiredFieldError", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredField", - "ObjectWithRequiredFieldError", -] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/__init__.py deleted file mode 100644 index 7e7e4c63a..000000000 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .nested_object_with_optional_field_error import NestedObjectWithOptionalFieldError -from .nested_object_with_required_field_error import NestedObjectWithRequiredFieldError -from .object_with_optional_field_error import ObjectWithOptionalFieldError -from .object_with_required_field_error import ObjectWithRequiredFieldError - -__all__ = [ - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredFieldError", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredFieldError", -] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/__init__.py deleted file mode 100644 index 30187ae02..000000000 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Animal, Animal_Cat, Animal_Dog, Cat, Dog -from .errors import ErrorWithUnionBody - -__all__ = ["Animal", "Animal_Cat", "Animal_Dog", "Cat", "Dog", "ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/errors/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/errors/__init__.py deleted file mode 100644 index 568a71fa3..000000000 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .error_with_union_body import ErrorWithUnionBody - -__all__ = ["ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/__init__.py similarity index 100% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/__init__.py diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/errors/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/enum/__init__.py similarity index 56% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/errors/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/enum/__init__.py index f5945e36d..02e5f9749 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/errors/__init__.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/enum/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. from .error_with_enum_body import ErrorWithEnumBody +from .weather_report import WeatherReport -__all__ = ["ErrorWithEnumBody"] +__all__ = ["ErrorWithEnumBody", "WeatherReport"] diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/enum/error_with_enum_body.py similarity index 68% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/enum/error_with_enum_body.py index b38481a10..1d45e9e64 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/enum/error_with_enum_body.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.weather_report import WeatherReport +from ...core.api_error import ApiError +from .weather_report import WeatherReport class ErrorWithEnumBody(ApiError): diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/types/weather_report.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/enum/weather_report.py similarity index 100% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/types/weather_report.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/enum/weather_report.py diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/__init__.py similarity index 54% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/__init__.py index 616060b4b..5ec200ef3 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/__init__.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/__init__.py @@ -1,15 +1,23 @@ # This file was auto-generated by Fern from our API Definition. from .nested_object_with_optional_field import NestedObjectWithOptionalField +from .nested_object_with_optional_field_error import NestedObjectWithOptionalFieldError from .nested_object_with_required_field import NestedObjectWithRequiredField +from .nested_object_with_required_field_error import NestedObjectWithRequiredFieldError from .object_with_map_of_map import ObjectWithMapOfMap from .object_with_optional_field import ObjectWithOptionalField +from .object_with_optional_field_error import ObjectWithOptionalFieldError from .object_with_required_field import ObjectWithRequiredField +from .object_with_required_field_error import ObjectWithRequiredFieldError __all__ = [ "NestedObjectWithOptionalField", + "NestedObjectWithOptionalFieldError", "NestedObjectWithRequiredField", + "NestedObjectWithRequiredFieldError", "ObjectWithMapOfMap", "ObjectWithOptionalField", + "ObjectWithOptionalFieldError", "ObjectWithRequiredField", + "ObjectWithRequiredFieldError", ] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/nested_object_with_optional_field.py similarity index 94% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/nested_object_with_optional_field.py index 6b4a1ab14..a36d32f15 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/nested_object_with_optional_field.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField try: diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/nested_object_with_optional_field_error.py similarity index 64% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/nested_object_with_optional_field_error.py index 06f5bab4a..90e6a4f4a 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/nested_object_with_optional_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.nested_object_with_optional_field import NestedObjectWithOptionalField +from ...core.api_error import ApiError +from .nested_object_with_optional_field import NestedObjectWithOptionalField class NestedObjectWithOptionalFieldError(ApiError): diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/nested_object_with_required_field.py similarity index 94% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/nested_object_with_required_field.py index c95accbe6..e2bfefda8 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/nested_object_with_required_field.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField try: diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/nested_object_with_required_field_error.py similarity index 64% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/nested_object_with_required_field_error.py index f97ea3f6d..e5236b2b2 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/nested_object_with_required_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.nested_object_with_required_field import NestedObjectWithRequiredField +from ...core.api_error import ApiError +from .nested_object_with_required_field import NestedObjectWithRequiredField class NestedObjectWithRequiredFieldError(ApiError): diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/object_with_map_of_map.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_map_of_map.py similarity index 93% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/object_with_map_of_map.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_map_of_map.py index 29f825059..1d7120705 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/object_with_map_of_map.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_map_of_map.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/object_with_optional_field.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_optional_field.py similarity index 95% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/object_with_optional_field.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_optional_field.py index 4d049137c..00520e117 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/object_with_optional_field.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_optional_field.py @@ -4,7 +4,7 @@ import typing import uuid -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_optional_field_error.py similarity index 66% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_optional_field_error.py index 0b1067ca3..1fc63749c 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_optional_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.object_with_optional_field import ObjectWithOptionalField +from ...core.api_error import ApiError +from .object_with_optional_field import ObjectWithOptionalField class ObjectWithOptionalFieldError(ApiError): diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/object_with_required_field.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_required_field.py similarity index 93% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/object_with_required_field.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_required_field.py index ca96bde6b..759fbc14b 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/object_with_required_field.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_required_field.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_required_field_error.py similarity index 66% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_required_field_error.py index cb158d3b8..d0fef8c96 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_required_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from .object_with_required_field import ObjectWithRequiredField class ObjectWithRequiredFieldError(ApiError): diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/types/__init__.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/union/__init__.py similarity index 53% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/types/__init__.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/union/__init__.py index 44ff66be5..f54aac3f2 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/types/__init__.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/union/__init__.py @@ -3,5 +3,6 @@ from .animal import Animal, Animal_Cat, Animal_Dog from .cat import Cat from .dog import Dog +from .error_with_union_body import ErrorWithUnionBody -__all__ = ["Animal", "Animal_Cat", "Animal_Dog", "Cat", "Dog"] +__all__ = ["Animal", "Animal_Cat", "Animal_Dog", "Cat", "Dog", "ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/types/animal.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/union/animal.py similarity index 100% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/types/animal.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/union/animal.py diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/types/cat.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/union/cat.py similarity index 94% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/types/cat.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/union/cat.py index b8dba54f6..ed422273f 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/types/cat.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/union/cat.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/types/dog.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/union/dog.py similarity index 94% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/types/dog.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/union/dog.py index 02da77f9c..47ba2ba16 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/types/dog.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/union/dog.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/errors/error_with_union_body.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/union/error_with_union_body.py similarity index 71% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/errors/error_with_union_body.py rename to seed/sdk/exhaustive/extra_dependencies/src/seed/types/union/error_with_union_body.py index 6a4247666..2236b7d67 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/errors/error_with_union_body.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/union/error_with_union_body.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.animal import Animal +from ...core.api_error import ApiError +from .animal import Animal class ErrorWithUnionBody(ApiError): diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/__init__.py index 3616a8644..3e6746abf 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/__init__.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/__init__.py @@ -1,16 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import ( - BadObjectRequestInfo, - BadRequestBody, - endpoints, - general_errors, - inlined_requests, - no_auth, - no_req_body, - req_with_headers, - types, -) +from . import endpoints, general_errors, inlined_requests, no_auth, no_req_body, req_with_headers, types +from .general_errors import BadObjectRequestInfo, BadRequestBody __all__ = [ "BadObjectRequestInfo", diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/client.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/client.py index c6d70222c..5b0307830 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/client.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/client.py @@ -5,11 +5,11 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.endpoints.client import AsyncEndpointsClient, EndpointsClient -from .resources.inlined_requests.client import AsyncInlinedRequestsClient, InlinedRequestsClient -from .resources.no_auth.client import AsyncNoAuthClient, NoAuthClient -from .resources.no_req_body.client import AsyncNoReqBodyClient, NoReqBodyClient -from .resources.req_with_headers.client import AsyncReqWithHeadersClient, ReqWithHeadersClient +from .endpoints._client import AsyncEndpointsClient, EndpointsClient +from .inlined_requests._client import AsyncInlinedRequestsClient, InlinedRequestsClient +from .no_auth._client import AsyncNoAuthClient, NoAuthClient +from .no_req_body._client import AsyncNoReqBodyClient, NoReqBodyClient +from .req_with_headers._client import AsyncReqWithHeadersClient, ReqWithHeadersClient class SeedExhaustive: diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/__init__.py similarity index 100% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/__init__.py diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/client.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/_client.py similarity index 71% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/client.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/_client.py index fcfbb5adb..c2222257a 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/client.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/_client.py @@ -1,13 +1,13 @@ # This file was auto-generated by Fern from our API Definition. -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.container.client import AsyncContainerClient, ContainerClient -from .resources.enum.client import AsyncEnumClient, EnumClient -from .resources.http_methods.client import AsyncHttpMethodsClient, HttpMethodsClient -from .resources.object.client import AsyncObjectClient, ObjectClient -from .resources.params.client import AsyncParamsClient, ParamsClient -from .resources.primitive.client import AsyncPrimitiveClient, PrimitiveClient -from .resources.union.client import AsyncUnionClient, UnionClient +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .container._client import AsyncContainerClient, ContainerClient +from .enum._client import AsyncEnumClient, EnumClient +from .http_methods._client import AsyncHttpMethodsClient, HttpMethodsClient +from .object._client import AsyncObjectClient, ObjectClient +from .params._client import AsyncParamsClient, ParamsClient +from .primitive._client import AsyncPrimitiveClient, PrimitiveClient +from .union._client import AsyncUnionClient, UnionClient class EndpointsClient: diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/enum/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/container/__init__.py similarity index 100% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/enum/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/container/__init__.py diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/container/client.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/container/_client.py similarity index 98% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/container/client.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/container/_client.py index 2798df9f1..bdba9142e 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/container/client.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/container/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/http_methods/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/enum/__init__.py similarity index 100% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/http_methods/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/enum/__init__.py diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/enum/client.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/enum/_client.py similarity index 90% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/enum/client.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/enum/_client.py index 5f1a70152..ef6518813 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/enum/client.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/enum/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.enum.types.weather_report import WeatherReport +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.enum.weather_report import WeatherReport try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/object/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/http_methods/__init__.py similarity index 100% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/object/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/http_methods/__init__.py diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/http_methods/client.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/http_methods/_client.py similarity index 96% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/http_methods/client.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/http_methods/_client.py index a91c74c09..15aaac00b 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/http_methods/client.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/http_methods/_client.py @@ -4,11 +4,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.object_with_optional_field import ObjectWithOptionalField +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/params/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/object/__init__.py similarity index 100% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/params/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/object/__init__.py diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/object/client.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/object/_client.py similarity index 94% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/object/client.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/object/_client.py index d6ba08f9f..5a3fc34ff 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/object/client.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/object/_client.py @@ -4,14 +4,14 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.nested_object_with_optional_field import NestedObjectWithOptionalField -from ....types.resources.object.types.nested_object_with_required_field import NestedObjectWithRequiredField -from ....types.resources.object.types.object_with_map_of_map import ObjectWithMapOfMap -from ....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.nested_object_with_optional_field import NestedObjectWithOptionalField +from ...types.object.nested_object_with_required_field import NestedObjectWithRequiredField +from ...types.object.object_with_map_of_map import ObjectWithMapOfMap +from ...types.object.object_with_optional_field import ObjectWithOptionalField +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/primitive/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/params/__init__.py similarity index 100% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/primitive/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/params/__init__.py diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/params/client.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/params/_client.py similarity index 97% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/params/client.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/params/_client.py index 995992821..670733c47 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/params/client.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/params/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from .....core.remove_none_from_dict import remove_none_from_dict +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...core.remove_none_from_dict import remove_none_from_dict try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/union/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/primitive/__init__.py similarity index 100% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/union/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/primitive/__init__.py diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/primitive/client.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/primitive/_client.py similarity index 98% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/primitive/client.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/primitive/_client.py index 6aa1d7060..776c3d2e7 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/primitive/client.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/primitive/_client.py @@ -6,9 +6,9 @@ import uuid from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/inlined_requests/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/union/__init__.py similarity index 100% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/inlined_requests/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/union/__init__.py diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/union/client.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/union/_client.py similarity index 90% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/union/client.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/union/_client.py index e26061680..e88371c73 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/resources/union/client.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/union/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.union.types.animal import Animal +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.union.animal import Animal try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/types/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/general_errors/__init__.py similarity index 55% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/types/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/general_errors/__init__.py index b6788a570..d34511a58 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/types/__init__.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/general_errors/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. from .bad_object_request_info import BadObjectRequestInfo +from .bad_request_body import BadRequestBody -__all__ = ["BadObjectRequestInfo"] +__all__ = ["BadObjectRequestInfo", "BadRequestBody"] diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/types/bad_object_request_info.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/general_errors/bad_object_request_info.py similarity index 93% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/types/bad_object_request_info.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/general_errors/bad_object_request_info.py index 4efd8af31..9196a5146 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/types/bad_object_request_info.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/general_errors/bad_object_request_info.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/errors/bad_request_body.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/general_errors/bad_request_body.py similarity index 66% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/errors/bad_request_body.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/general_errors/bad_request_body.py index 7ca134935..0305d0248 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/errors/bad_request_body.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/general_errors/bad_request_body.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.api_error import ApiError -from ..types.bad_object_request_info import BadObjectRequestInfo +from ..core.api_error import ApiError +from .bad_object_request_info import BadObjectRequestInfo class BadRequestBody(ApiError): diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/no_auth/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/inlined_requests/__init__.py similarity index 100% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/no_auth/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/inlined_requests/__init__.py diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/inlined_requests/client.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/inlined_requests/_client.py similarity index 88% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/inlined_requests/client.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/inlined_requests/_client.py index 23ea88d28..3157d4eda 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/inlined_requests/client.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/inlined_requests/_client.py @@ -4,12 +4,12 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..general_errors.errors.bad_request_body import BadRequestBody -from ..general_errors.types.bad_object_request_info import BadObjectRequestInfo -from ..types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..general_errors.bad_object_request_info import BadObjectRequestInfo +from ..general_errors.bad_request_body import BadRequestBody +from ..types.object.object_with_optional_field import ObjectWithOptionalField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/no_req_body/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/no_auth/__init__.py similarity index 100% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/no_req_body/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/no_auth/__init__.py diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/no_auth/client.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/no_auth/_client.py similarity index 89% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/no_auth/client.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/no_auth/_client.py index 3b4269e75..0a5df28fc 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/no_auth/client.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/no_auth/_client.py @@ -4,11 +4,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..general_errors.errors.bad_request_body import BadRequestBody -from ..general_errors.types.bad_object_request_info import BadObjectRequestInfo +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..general_errors.bad_object_request_info import BadObjectRequestInfo +from ..general_errors.bad_request_body import BadRequestBody try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/req_with_headers/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/no_req_body/__init__.py similarity index 100% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/req_with_headers/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/no_req_body/__init__.py diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/no_req_body/client.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/no_req_body/_client.py similarity index 94% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/no_req_body/client.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/no_req_body/_client.py index 51ad5fd9d..ea8cadc9e 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/no_req_body/client.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/no_req_body/_client.py @@ -3,9 +3,9 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ..types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..types.object.object_with_optional_field import ObjectWithOptionalField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/container/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/req_with_headers/__init__.py similarity index 100% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/container/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/req_with_headers/__init__.py diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/req_with_headers/client.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/req_with_headers/_client.py similarity index 92% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/req_with_headers/client.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/req_with_headers/_client.py index 2cd78e264..3e6871dca 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/req_with_headers/client.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/req_with_headers/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ...core.remove_none_from_dict import remove_none_from_dict +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..core.remove_none_from_dict import remove_none_from_dict # this is used as the default value for optional parameters OMIT = typing.cast(typing.Any, ...) diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/__init__.py deleted file mode 100644 index 3e6746abf..000000000 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import endpoints, general_errors, inlined_requests, no_auth, no_req_body, req_with_headers, types -from .general_errors import BadObjectRequestInfo, BadRequestBody - -__all__ = [ - "BadObjectRequestInfo", - "BadRequestBody", - "endpoints", - "general_errors", - "inlined_requests", - "no_auth", - "no_req_body", - "req_with_headers", - "types", -] diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/__init__.py deleted file mode 100644 index 466c54f1d..000000000 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import container, enum, http_methods, object, params, primitive, union - -__all__ = ["container", "enum", "http_methods", "object", "params", "primitive", "union"] diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/__init__.py deleted file mode 100644 index 57de0a862..000000000 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import BadObjectRequestInfo -from .errors import BadRequestBody - -__all__ = ["BadObjectRequestInfo", "BadRequestBody"] diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/errors/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/errors/__init__.py deleted file mode 100644 index 04eaf8e38..000000000 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/general_errors/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .bad_request_body import BadRequestBody - -__all__ = ["BadRequestBody"] diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/__init__.py deleted file mode 100644 index b54f8fbcd..000000000 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/__init__.py +++ /dev/null @@ -1,47 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import ( - Animal, - Animal_Cat, - Animal_Dog, - Cat, - Dog, - ErrorWithEnumBody, - ErrorWithUnionBody, - NestedObjectWithOptionalField, - NestedObjectWithOptionalFieldError, - NestedObjectWithRequiredField, - NestedObjectWithRequiredFieldError, - ObjectWithMapOfMap, - ObjectWithOptionalField, - ObjectWithOptionalFieldError, - ObjectWithRequiredField, - ObjectWithRequiredFieldError, - WeatherReport, - enum, - object, - union, -) - -__all__ = [ - "Animal", - "Animal_Cat", - "Animal_Dog", - "Cat", - "Dog", - "ErrorWithEnumBody", - "ErrorWithUnionBody", - "NestedObjectWithOptionalField", - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredField", - "NestedObjectWithRequiredFieldError", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredField", - "ObjectWithRequiredFieldError", - "WeatherReport", - "enum", - "object", - "union", -] diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/__init__.py deleted file mode 100644 index b1c48999a..000000000 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import WeatherReport -from .errors import ErrorWithEnumBody - -__all__ = ["ErrorWithEnumBody", "WeatherReport"] diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/types/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/types/__init__.py deleted file mode 100644 index 7a47d1fef..000000000 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/types/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .weather_report import WeatherReport - -__all__ = ["WeatherReport"] diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/__init__.py deleted file mode 100644 index 3b74145a2..000000000 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/__init__.py +++ /dev/null @@ -1,27 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - NestedObjectWithOptionalField, - NestedObjectWithRequiredField, - ObjectWithMapOfMap, - ObjectWithOptionalField, - ObjectWithRequiredField, -) -from .errors import ( - NestedObjectWithOptionalFieldError, - NestedObjectWithRequiredFieldError, - ObjectWithOptionalFieldError, - ObjectWithRequiredFieldError, -) - -__all__ = [ - "NestedObjectWithOptionalField", - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredField", - "NestedObjectWithRequiredFieldError", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredField", - "ObjectWithRequiredFieldError", -] diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/__init__.py deleted file mode 100644 index 7e7e4c63a..000000000 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .nested_object_with_optional_field_error import NestedObjectWithOptionalFieldError -from .nested_object_with_required_field_error import NestedObjectWithRequiredFieldError -from .object_with_optional_field_error import ObjectWithOptionalFieldError -from .object_with_required_field_error import ObjectWithRequiredFieldError - -__all__ = [ - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredFieldError", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredFieldError", -] diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/__init__.py deleted file mode 100644 index 30187ae02..000000000 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Animal, Animal_Cat, Animal_Dog, Cat, Dog -from .errors import ErrorWithUnionBody - -__all__ = ["Animal", "Animal_Cat", "Animal_Dog", "Cat", "Dog", "ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/errors/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/errors/__init__.py deleted file mode 100644 index 568a71fa3..000000000 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .error_with_union_body import ErrorWithUnionBody - -__all__ = ["ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/__init__.py similarity index 100% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/__init__.py diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/errors/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/enum/__init__.py similarity index 56% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/errors/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/enum/__init__.py index f5945e36d..02e5f9749 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/errors/__init__.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/enum/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. from .error_with_enum_body import ErrorWithEnumBody +from .weather_report import WeatherReport -__all__ = ["ErrorWithEnumBody"] +__all__ = ["ErrorWithEnumBody", "WeatherReport"] diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/enum/error_with_enum_body.py similarity index 68% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/enum/error_with_enum_body.py index b38481a10..1d45e9e64 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/enum/error_with_enum_body.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.weather_report import WeatherReport +from ...core.api_error import ApiError +from .weather_report import WeatherReport class ErrorWithEnumBody(ApiError): diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/types/weather_report.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/enum/weather_report.py similarity index 100% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/types/weather_report.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/enum/weather_report.py diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/__init__.py similarity index 54% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/__init__.py index 616060b4b..5ec200ef3 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/__init__.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/__init__.py @@ -1,15 +1,23 @@ # This file was auto-generated by Fern from our API Definition. from .nested_object_with_optional_field import NestedObjectWithOptionalField +from .nested_object_with_optional_field_error import NestedObjectWithOptionalFieldError from .nested_object_with_required_field import NestedObjectWithRequiredField +from .nested_object_with_required_field_error import NestedObjectWithRequiredFieldError from .object_with_map_of_map import ObjectWithMapOfMap from .object_with_optional_field import ObjectWithOptionalField +from .object_with_optional_field_error import ObjectWithOptionalFieldError from .object_with_required_field import ObjectWithRequiredField +from .object_with_required_field_error import ObjectWithRequiredFieldError __all__ = [ "NestedObjectWithOptionalField", + "NestedObjectWithOptionalFieldError", "NestedObjectWithRequiredField", + "NestedObjectWithRequiredFieldError", "ObjectWithMapOfMap", "ObjectWithOptionalField", + "ObjectWithOptionalFieldError", "ObjectWithRequiredField", + "ObjectWithRequiredFieldError", ] diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/nested_object_with_optional_field.py similarity index 94% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/nested_object_with_optional_field.py index 6b4a1ab14..a36d32f15 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/nested_object_with_optional_field.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField try: diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/nested_object_with_optional_field_error.py similarity index 64% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/nested_object_with_optional_field_error.py index 06f5bab4a..90e6a4f4a 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/nested_object_with_optional_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.nested_object_with_optional_field import NestedObjectWithOptionalField +from ...core.api_error import ApiError +from .nested_object_with_optional_field import NestedObjectWithOptionalField class NestedObjectWithOptionalFieldError(ApiError): diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/nested_object_with_required_field.py similarity index 94% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/nested_object_with_required_field.py index c95accbe6..e2bfefda8 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/nested_object_with_required_field.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField try: diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/nested_object_with_required_field_error.py similarity index 64% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/nested_object_with_required_field_error.py index f97ea3f6d..e5236b2b2 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/nested_object_with_required_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.nested_object_with_required_field import NestedObjectWithRequiredField +from ...core.api_error import ApiError +from .nested_object_with_required_field import NestedObjectWithRequiredField class NestedObjectWithRequiredFieldError(ApiError): diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/object_with_map_of_map.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_map_of_map.py similarity index 93% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/object_with_map_of_map.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_map_of_map.py index 29f825059..1d7120705 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/object_with_map_of_map.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_map_of_map.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/object_with_optional_field.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_optional_field.py similarity index 95% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/object_with_optional_field.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_optional_field.py index 4d049137c..00520e117 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/object_with_optional_field.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_optional_field.py @@ -4,7 +4,7 @@ import typing import uuid -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_optional_field_error.py similarity index 66% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_optional_field_error.py index 0b1067ca3..1fc63749c 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_optional_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.object_with_optional_field import ObjectWithOptionalField +from ...core.api_error import ApiError +from .object_with_optional_field import ObjectWithOptionalField class ObjectWithOptionalFieldError(ApiError): diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/object_with_required_field.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_required_field.py similarity index 93% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/object_with_required_field.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_required_field.py index ca96bde6b..759fbc14b 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/object_with_required_field.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_required_field.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_required_field_error.py similarity index 66% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_required_field_error.py index cb158d3b8..d0fef8c96 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_required_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from .object_with_required_field import ObjectWithRequiredField class ObjectWithRequiredFieldError(ApiError): diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/types/__init__.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/union/__init__.py similarity index 53% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/types/__init__.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/union/__init__.py index 44ff66be5..f54aac3f2 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/types/__init__.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/union/__init__.py @@ -3,5 +3,6 @@ from .animal import Animal, Animal_Cat, Animal_Dog from .cat import Cat from .dog import Dog +from .error_with_union_body import ErrorWithUnionBody -__all__ = ["Animal", "Animal_Cat", "Animal_Dog", "Cat", "Dog"] +__all__ = ["Animal", "Animal_Cat", "Animal_Dog", "Cat", "Dog", "ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/types/animal.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/union/animal.py similarity index 100% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/types/animal.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/union/animal.py diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/types/cat.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/union/cat.py similarity index 94% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/types/cat.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/union/cat.py index b8dba54f6..ed422273f 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/types/cat.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/union/cat.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/types/dog.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/union/dog.py similarity index 94% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/types/dog.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/union/dog.py index 02da77f9c..47ba2ba16 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/types/dog.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/union/dog.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/errors/error_with_union_body.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/union/error_with_union_body.py similarity index 71% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/errors/error_with_union_body.py rename to seed/sdk/exhaustive/five-second-timeout/src/seed/types/union/error_with_union_body.py index 6a4247666..2236b7d67 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/errors/error_with_union_body.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/union/error_with_union_body.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.animal import Animal +from ...core.api_error import ApiError +from .animal import Animal class ErrorWithUnionBody(ApiError): diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/__init__.py index 3616a8644..3e6746abf 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/__init__.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/__init__.py @@ -1,16 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import ( - BadObjectRequestInfo, - BadRequestBody, - endpoints, - general_errors, - inlined_requests, - no_auth, - no_req_body, - req_with_headers, - types, -) +from . import endpoints, general_errors, inlined_requests, no_auth, no_req_body, req_with_headers, types +from .general_errors import BadObjectRequestInfo, BadRequestBody __all__ = [ "BadObjectRequestInfo", diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/client.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/client.py index 235b352fe..320c5deb2 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/client.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/client.py @@ -5,11 +5,11 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.endpoints.client import AsyncEndpointsClient, EndpointsClient -from .resources.inlined_requests.client import AsyncInlinedRequestsClient, InlinedRequestsClient -from .resources.no_auth.client import AsyncNoAuthClient, NoAuthClient -from .resources.no_req_body.client import AsyncNoReqBodyClient, NoReqBodyClient -from .resources.req_with_headers.client import AsyncReqWithHeadersClient, ReqWithHeadersClient +from .endpoints._client import AsyncEndpointsClient, EndpointsClient +from .inlined_requests._client import AsyncInlinedRequestsClient, InlinedRequestsClient +from .no_auth._client import AsyncNoAuthClient, NoAuthClient +from .no_req_body._client import AsyncNoReqBodyClient, NoReqBodyClient +from .req_with_headers._client import AsyncReqWithHeadersClient, ReqWithHeadersClient class SeedExhaustive: diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/__init__.py similarity index 100% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/__init__.py diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/client.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/_client.py similarity index 71% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/client.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/_client.py index fcfbb5adb..c2222257a 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/client.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/_client.py @@ -1,13 +1,13 @@ # This file was auto-generated by Fern from our API Definition. -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.container.client import AsyncContainerClient, ContainerClient -from .resources.enum.client import AsyncEnumClient, EnumClient -from .resources.http_methods.client import AsyncHttpMethodsClient, HttpMethodsClient -from .resources.object.client import AsyncObjectClient, ObjectClient -from .resources.params.client import AsyncParamsClient, ParamsClient -from .resources.primitive.client import AsyncPrimitiveClient, PrimitiveClient -from .resources.union.client import AsyncUnionClient, UnionClient +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .container._client import AsyncContainerClient, ContainerClient +from .enum._client import AsyncEnumClient, EnumClient +from .http_methods._client import AsyncHttpMethodsClient, HttpMethodsClient +from .object._client import AsyncObjectClient, ObjectClient +from .params._client import AsyncParamsClient, ParamsClient +from .primitive._client import AsyncPrimitiveClient, PrimitiveClient +from .union._client import AsyncUnionClient, UnionClient class EndpointsClient: diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/enum/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/container/__init__.py similarity index 100% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/enum/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/container/__init__.py diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/container/client.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/container/_client.py similarity index 98% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/container/client.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/container/_client.py index 19f83d797..8005ac298 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/container/client.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/container/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/http_methods/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/enum/__init__.py similarity index 100% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/http_methods/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/enum/__init__.py diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/enum/client.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/enum/_client.py similarity index 90% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/enum/client.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/enum/_client.py index 8c00aadf5..e16e98574 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/enum/client.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/enum/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.enum.types.weather_report import WeatherReport +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.enum.weather_report import WeatherReport try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/object/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/http_methods/__init__.py similarity index 100% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/object/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/http_methods/__init__.py diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/http_methods/client.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/http_methods/_client.py similarity index 96% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/http_methods/client.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/http_methods/_client.py index 65ffd5722..4de91e362 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/http_methods/client.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/http_methods/_client.py @@ -4,11 +4,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.object_with_optional_field import ObjectWithOptionalField +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/params/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/object/__init__.py similarity index 100% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/params/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/object/__init__.py diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/object/client.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/object/_client.py similarity index 94% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/object/client.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/object/_client.py index 8f0a39bf8..a39033fd9 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/object/client.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/object/_client.py @@ -4,14 +4,14 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.nested_object_with_optional_field import NestedObjectWithOptionalField -from ....types.resources.object.types.nested_object_with_required_field import NestedObjectWithRequiredField -from ....types.resources.object.types.object_with_map_of_map import ObjectWithMapOfMap -from ....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.nested_object_with_optional_field import NestedObjectWithOptionalField +from ...types.object.nested_object_with_required_field import NestedObjectWithRequiredField +from ...types.object.object_with_map_of_map import ObjectWithMapOfMap +from ...types.object.object_with_optional_field import ObjectWithOptionalField +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/primitive/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/params/__init__.py similarity index 100% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/primitive/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/params/__init__.py diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/params/client.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/params/_client.py similarity index 97% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/params/client.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/params/_client.py index bfdfdf82d..53f901ea4 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/params/client.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/params/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from .....core.remove_none_from_dict import remove_none_from_dict +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...core.remove_none_from_dict import remove_none_from_dict try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/union/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/primitive/__init__.py similarity index 100% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/union/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/primitive/__init__.py diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/primitive/client.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/primitive/_client.py similarity index 98% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/primitive/client.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/primitive/_client.py index 606c8107b..7b53812dd 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/primitive/client.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/primitive/_client.py @@ -6,9 +6,9 @@ import uuid from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/inlined_requests/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/union/__init__.py similarity index 100% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/inlined_requests/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/union/__init__.py diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/union/client.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/union/_client.py similarity index 90% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/union/client.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/union/_client.py index 6b4b34492..9019a4de2 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/resources/union/client.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/union/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.union.types.animal import Animal +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.union.animal import Animal try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/types/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/general_errors/__init__.py similarity index 55% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/types/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/general_errors/__init__.py index b6788a570..d34511a58 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/general_errors/types/__init__.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/general_errors/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. from .bad_object_request_info import BadObjectRequestInfo +from .bad_request_body import BadRequestBody -__all__ = ["BadObjectRequestInfo"] +__all__ = ["BadObjectRequestInfo", "BadRequestBody"] diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/types/bad_object_request_info.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/general_errors/bad_object_request_info.py similarity index 93% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/types/bad_object_request_info.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/general_errors/bad_object_request_info.py index 4efd8af31..9196a5146 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/types/bad_object_request_info.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/general_errors/bad_object_request_info.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/errors/bad_request_body.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/general_errors/bad_request_body.py similarity index 66% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/errors/bad_request_body.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/general_errors/bad_request_body.py index 7ca134935..0305d0248 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/errors/bad_request_body.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/general_errors/bad_request_body.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.api_error import ApiError -from ..types.bad_object_request_info import BadObjectRequestInfo +from ..core.api_error import ApiError +from .bad_object_request_info import BadObjectRequestInfo class BadRequestBody(ApiError): diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/no_auth/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/inlined_requests/__init__.py similarity index 100% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/no_auth/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/inlined_requests/__init__.py diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/inlined_requests/client.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/inlined_requests/_client.py similarity index 88% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/inlined_requests/client.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/inlined_requests/_client.py index a00a6a2f9..0bfa24904 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/inlined_requests/client.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/inlined_requests/_client.py @@ -4,12 +4,12 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..general_errors.errors.bad_request_body import BadRequestBody -from ..general_errors.types.bad_object_request_info import BadObjectRequestInfo -from ..types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..general_errors.bad_object_request_info import BadObjectRequestInfo +from ..general_errors.bad_request_body import BadRequestBody +from ..types.object.object_with_optional_field import ObjectWithOptionalField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/no_req_body/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/no_auth/__init__.py similarity index 100% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/no_req_body/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/no_auth/__init__.py diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/no_auth/client.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/no_auth/_client.py similarity index 89% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/no_auth/client.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/no_auth/_client.py index 334a32a41..a22e03af9 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/no_auth/client.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/no_auth/_client.py @@ -4,11 +4,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..general_errors.errors.bad_request_body import BadRequestBody -from ..general_errors.types.bad_object_request_info import BadObjectRequestInfo +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..general_errors.bad_object_request_info import BadObjectRequestInfo +from ..general_errors.bad_request_body import BadRequestBody try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/req_with_headers/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/no_req_body/__init__.py similarity index 100% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/req_with_headers/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/no_req_body/__init__.py diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/no_req_body/client.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/no_req_body/_client.py similarity index 94% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/no_req_body/client.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/no_req_body/_client.py index 3b5661b6b..0b6ffd356 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/no_req_body/client.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/no_req_body/_client.py @@ -3,9 +3,9 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ..types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..types.object.object_with_optional_field import ObjectWithOptionalField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/container/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/req_with_headers/__init__.py similarity index 100% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/container/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/req_with_headers/__init__.py diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/req_with_headers/client.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/req_with_headers/_client.py similarity index 92% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/req_with_headers/client.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/req_with_headers/_client.py index f5cc60767..b59273ed4 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/req_with_headers/client.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/req_with_headers/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ...core.remove_none_from_dict import remove_none_from_dict +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..core.remove_none_from_dict import remove_none_from_dict # this is used as the default value for optional parameters OMIT = typing.cast(typing.Any, ...) diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/__init__.py deleted file mode 100644 index 3e6746abf..000000000 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import endpoints, general_errors, inlined_requests, no_auth, no_req_body, req_with_headers, types -from .general_errors import BadObjectRequestInfo, BadRequestBody - -__all__ = [ - "BadObjectRequestInfo", - "BadRequestBody", - "endpoints", - "general_errors", - "inlined_requests", - "no_auth", - "no_req_body", - "req_with_headers", - "types", -] diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/__init__.py deleted file mode 100644 index 466c54f1d..000000000 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/endpoints/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import container, enum, http_methods, object, params, primitive, union - -__all__ = ["container", "enum", "http_methods", "object", "params", "primitive", "union"] diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/__init__.py deleted file mode 100644 index 57de0a862..000000000 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import BadObjectRequestInfo -from .errors import BadRequestBody - -__all__ = ["BadObjectRequestInfo", "BadRequestBody"] diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/errors/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/errors/__init__.py deleted file mode 100644 index 04eaf8e38..000000000 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .bad_request_body import BadRequestBody - -__all__ = ["BadRequestBody"] diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/__init__.py deleted file mode 100644 index b54f8fbcd..000000000 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/__init__.py +++ /dev/null @@ -1,47 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import ( - Animal, - Animal_Cat, - Animal_Dog, - Cat, - Dog, - ErrorWithEnumBody, - ErrorWithUnionBody, - NestedObjectWithOptionalField, - NestedObjectWithOptionalFieldError, - NestedObjectWithRequiredField, - NestedObjectWithRequiredFieldError, - ObjectWithMapOfMap, - ObjectWithOptionalField, - ObjectWithOptionalFieldError, - ObjectWithRequiredField, - ObjectWithRequiredFieldError, - WeatherReport, - enum, - object, - union, -) - -__all__ = [ - "Animal", - "Animal_Cat", - "Animal_Dog", - "Cat", - "Dog", - "ErrorWithEnumBody", - "ErrorWithUnionBody", - "NestedObjectWithOptionalField", - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredField", - "NestedObjectWithRequiredFieldError", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredField", - "ObjectWithRequiredFieldError", - "WeatherReport", - "enum", - "object", - "union", -] diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/__init__.py deleted file mode 100644 index b1c48999a..000000000 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import WeatherReport -from .errors import ErrorWithEnumBody - -__all__ = ["ErrorWithEnumBody", "WeatherReport"] diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/types/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/types/__init__.py deleted file mode 100644 index 7a47d1fef..000000000 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/types/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .weather_report import WeatherReport - -__all__ = ["WeatherReport"] diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/__init__.py deleted file mode 100644 index 3b74145a2..000000000 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/__init__.py +++ /dev/null @@ -1,27 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - NestedObjectWithOptionalField, - NestedObjectWithRequiredField, - ObjectWithMapOfMap, - ObjectWithOptionalField, - ObjectWithRequiredField, -) -from .errors import ( - NestedObjectWithOptionalFieldError, - NestedObjectWithRequiredFieldError, - ObjectWithOptionalFieldError, - ObjectWithRequiredFieldError, -) - -__all__ = [ - "NestedObjectWithOptionalField", - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredField", - "NestedObjectWithRequiredFieldError", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredField", - "ObjectWithRequiredFieldError", -] diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/__init__.py deleted file mode 100644 index 7e7e4c63a..000000000 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .nested_object_with_optional_field_error import NestedObjectWithOptionalFieldError -from .nested_object_with_required_field_error import NestedObjectWithRequiredFieldError -from .object_with_optional_field_error import ObjectWithOptionalFieldError -from .object_with_required_field_error import ObjectWithRequiredFieldError - -__all__ = [ - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredFieldError", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredFieldError", -] diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/__init__.py deleted file mode 100644 index 30187ae02..000000000 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Animal, Animal_Cat, Animal_Dog, Cat, Dog -from .errors import ErrorWithUnionBody - -__all__ = ["Animal", "Animal_Cat", "Animal_Dog", "Cat", "Dog", "ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/errors/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/errors/__init__.py deleted file mode 100644 index 568a71fa3..000000000 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .error_with_union_body import ErrorWithUnionBody - -__all__ = ["ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/__init__.py similarity index 100% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/__init__.py diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/errors/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/enum/__init__.py similarity index 56% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/errors/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/enum/__init__.py index f5945e36d..02e5f9749 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/enum/errors/__init__.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/enum/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. from .error_with_enum_body import ErrorWithEnumBody +from .weather_report import WeatherReport -__all__ = ["ErrorWithEnumBody"] +__all__ = ["ErrorWithEnumBody", "WeatherReport"] diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/enum/error_with_enum_body.py similarity index 68% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/enum/error_with_enum_body.py index b38481a10..1d45e9e64 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/enum/error_with_enum_body.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.weather_report import WeatherReport +from ...core.api_error import ApiError +from .weather_report import WeatherReport class ErrorWithEnumBody(ApiError): diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/types/weather_report.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/enum/weather_report.py similarity index 100% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/enum/types/weather_report.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/enum/weather_report.py diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/__init__.py similarity index 54% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/__init__.py index 616060b4b..5ec200ef3 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/__init__.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/__init__.py @@ -1,15 +1,23 @@ # This file was auto-generated by Fern from our API Definition. from .nested_object_with_optional_field import NestedObjectWithOptionalField +from .nested_object_with_optional_field_error import NestedObjectWithOptionalFieldError from .nested_object_with_required_field import NestedObjectWithRequiredField +from .nested_object_with_required_field_error import NestedObjectWithRequiredFieldError from .object_with_map_of_map import ObjectWithMapOfMap from .object_with_optional_field import ObjectWithOptionalField +from .object_with_optional_field_error import ObjectWithOptionalFieldError from .object_with_required_field import ObjectWithRequiredField +from .object_with_required_field_error import ObjectWithRequiredFieldError __all__ = [ "NestedObjectWithOptionalField", + "NestedObjectWithOptionalFieldError", "NestedObjectWithRequiredField", + "NestedObjectWithRequiredFieldError", "ObjectWithMapOfMap", "ObjectWithOptionalField", + "ObjectWithOptionalFieldError", "ObjectWithRequiredField", + "ObjectWithRequiredFieldError", ] diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/nested_object_with_optional_field.py similarity index 94% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/nested_object_with_optional_field.py index 6b4a1ab14..a36d32f15 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/nested_object_with_optional_field.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField try: diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/nested_object_with_optional_field_error.py similarity index 64% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/nested_object_with_optional_field_error.py index 06f5bab4a..90e6a4f4a 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/nested_object_with_optional_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.nested_object_with_optional_field import NestedObjectWithOptionalField +from ...core.api_error import ApiError +from .nested_object_with_optional_field import NestedObjectWithOptionalField class NestedObjectWithOptionalFieldError(ApiError): diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/nested_object_with_required_field.py similarity index 94% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/nested_object_with_required_field.py index c95accbe6..e2bfefda8 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/nested_object_with_required_field.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField try: diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/nested_object_with_required_field_error.py similarity index 64% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/nested_object_with_required_field_error.py index f97ea3f6d..e5236b2b2 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/nested_object_with_required_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.nested_object_with_required_field import NestedObjectWithRequiredField +from ...core.api_error import ApiError +from .nested_object_with_required_field import NestedObjectWithRequiredField class NestedObjectWithRequiredFieldError(ApiError): diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/object_with_map_of_map.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_map_of_map.py similarity index 93% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/object_with_map_of_map.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_map_of_map.py index 29f825059..1d7120705 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/object_with_map_of_map.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_map_of_map.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/object_with_optional_field.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_optional_field.py similarity index 95% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/object_with_optional_field.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_optional_field.py index 4d049137c..00520e117 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/object_with_optional_field.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_optional_field.py @@ -4,7 +4,7 @@ import typing import uuid -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_optional_field_error.py similarity index 66% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_optional_field_error.py index 0b1067ca3..1fc63749c 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_optional_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.object_with_optional_field import ObjectWithOptionalField +from ...core.api_error import ApiError +from .object_with_optional_field import ObjectWithOptionalField class ObjectWithOptionalFieldError(ApiError): diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/object_with_required_field.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_required_field.py similarity index 93% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/object_with_required_field.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_required_field.py index ca96bde6b..759fbc14b 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/object_with_required_field.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_required_field.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_required_field_error.py similarity index 66% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_required_field_error.py index cb158d3b8..d0fef8c96 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_required_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from .object_with_required_field import ObjectWithRequiredField class ObjectWithRequiredFieldError(ApiError): diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/types/__init__.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/union/__init__.py similarity index 53% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/types/__init__.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/union/__init__.py index 44ff66be5..f54aac3f2 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/types/__init__.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/union/__init__.py @@ -3,5 +3,6 @@ from .animal import Animal, Animal_Cat, Animal_Dog from .cat import Cat from .dog import Dog +from .error_with_union_body import ErrorWithUnionBody -__all__ = ["Animal", "Animal_Cat", "Animal_Dog", "Cat", "Dog"] +__all__ = ["Animal", "Animal_Cat", "Animal_Dog", "Cat", "Dog", "ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/types/animal.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/union/animal.py similarity index 100% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/types/animal.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/union/animal.py diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/types/cat.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/union/cat.py similarity index 94% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/types/cat.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/union/cat.py index b8dba54f6..ed422273f 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/types/cat.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/union/cat.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/types/dog.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/union/dog.py similarity index 94% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/types/dog.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/union/dog.py index 02da77f9c..47ba2ba16 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/types/dog.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/union/dog.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/errors/error_with_union_body.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/union/error_with_union_body.py similarity index 71% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/errors/error_with_union_body.py rename to seed/sdk/exhaustive/infinite-timeout/src/seed/types/union/error_with_union_body.py index 6a4247666..2236b7d67 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/union/errors/error_with_union_body.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/union/error_with_union_body.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.animal import Animal +from ...core.api_error import ApiError +from .animal import Animal class ErrorWithUnionBody(ApiError): diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/__init__.py index 3616a8644..3e6746abf 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/__init__.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/__init__.py @@ -1,16 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import ( - BadObjectRequestInfo, - BadRequestBody, - endpoints, - general_errors, - inlined_requests, - no_auth, - no_req_body, - req_with_headers, - types, -) +from . import endpoints, general_errors, inlined_requests, no_auth, no_req_body, req_with_headers, types +from .general_errors import BadObjectRequestInfo, BadRequestBody __all__ = [ "BadObjectRequestInfo", diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/client.py b/seed/sdk/exhaustive/no-custom-config/src/seed/client.py index dbf97215f..9c7c507a7 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/client.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/client.py @@ -5,11 +5,11 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.endpoints.client import AsyncEndpointsClient, EndpointsClient -from .resources.inlined_requests.client import AsyncInlinedRequestsClient, InlinedRequestsClient -from .resources.no_auth.client import AsyncNoAuthClient, NoAuthClient -from .resources.no_req_body.client import AsyncNoReqBodyClient, NoReqBodyClient -from .resources.req_with_headers.client import AsyncReqWithHeadersClient, ReqWithHeadersClient +from .endpoints._client import AsyncEndpointsClient, EndpointsClient +from .inlined_requests._client import AsyncInlinedRequestsClient, InlinedRequestsClient +from .no_auth._client import AsyncNoAuthClient, NoAuthClient +from .no_req_body._client import AsyncNoReqBodyClient, NoReqBodyClient +from .req_with_headers._client import AsyncReqWithHeadersClient, ReqWithHeadersClient class SeedExhaustive: diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/__init__.py similarity index 100% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/__init__.py diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/client.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/_client.py similarity index 71% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/client.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/_client.py index fcfbb5adb..c2222257a 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/endpoints/client.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/_client.py @@ -1,13 +1,13 @@ # This file was auto-generated by Fern from our API Definition. -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.container.client import AsyncContainerClient, ContainerClient -from .resources.enum.client import AsyncEnumClient, EnumClient -from .resources.http_methods.client import AsyncHttpMethodsClient, HttpMethodsClient -from .resources.object.client import AsyncObjectClient, ObjectClient -from .resources.params.client import AsyncParamsClient, ParamsClient -from .resources.primitive.client import AsyncPrimitiveClient, PrimitiveClient -from .resources.union.client import AsyncUnionClient, UnionClient +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .container._client import AsyncContainerClient, ContainerClient +from .enum._client import AsyncEnumClient, EnumClient +from .http_methods._client import AsyncHttpMethodsClient, HttpMethodsClient +from .object._client import AsyncObjectClient, ObjectClient +from .params._client import AsyncParamsClient, ParamsClient +from .primitive._client import AsyncPrimitiveClient, PrimitiveClient +from .union._client import AsyncUnionClient, UnionClient class EndpointsClient: diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/enum/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/container/__init__.py similarity index 100% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/enum/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/container/__init__.py diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/container/client.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/container/_client.py similarity index 98% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/container/client.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/container/_client.py index 46f5a7bb5..a2be5eada 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/container/client.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/container/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/http_methods/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/enum/__init__.py similarity index 100% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/http_methods/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/enum/__init__.py diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/enum/client.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/enum/_client.py similarity index 90% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/enum/client.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/enum/_client.py index 3d170208d..1ba552101 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/enum/client.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/enum/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.enum.types.weather_report import WeatherReport +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.enum.weather_report import WeatherReport try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/object/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/http_methods/__init__.py similarity index 100% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/object/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/http_methods/__init__.py diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/http_methods/client.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/http_methods/_client.py similarity index 96% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/http_methods/client.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/http_methods/_client.py index 051512b1c..15069936f 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/http_methods/client.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/http_methods/_client.py @@ -4,11 +4,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.object_with_optional_field import ObjectWithOptionalField +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/params/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/object/__init__.py similarity index 100% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/params/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/object/__init__.py diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/object/client.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/object/_client.py similarity index 94% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/object/client.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/object/_client.py index 760ea1337..5ac79cc2b 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/object/client.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/object/_client.py @@ -4,14 +4,14 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.nested_object_with_optional_field import NestedObjectWithOptionalField -from ....types.resources.object.types.nested_object_with_required_field import NestedObjectWithRequiredField -from ....types.resources.object.types.object_with_map_of_map import ObjectWithMapOfMap -from ....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.nested_object_with_optional_field import NestedObjectWithOptionalField +from ...types.object.nested_object_with_required_field import NestedObjectWithRequiredField +from ...types.object.object_with_map_of_map import ObjectWithMapOfMap +from ...types.object.object_with_optional_field import ObjectWithOptionalField +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/primitive/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/params/__init__.py similarity index 100% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/primitive/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/params/__init__.py diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/params/client.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/params/_client.py similarity index 97% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/params/client.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/params/_client.py index 47d962b12..d795b6954 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/params/client.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/params/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from .....core.remove_none_from_dict import remove_none_from_dict +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...core.remove_none_from_dict import remove_none_from_dict try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/union/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/primitive/__init__.py similarity index 100% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/union/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/primitive/__init__.py diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/primitive/client.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/primitive/_client.py similarity index 98% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/primitive/client.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/primitive/_client.py index ddfff18ca..187a46616 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/primitive/client.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/primitive/_client.py @@ -6,9 +6,9 @@ import uuid from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/inlined_requests/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/union/__init__.py similarity index 100% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/inlined_requests/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/union/__init__.py diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/union/client.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/union/_client.py similarity index 90% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/union/client.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/union/_client.py index a69f568c8..073ca13a5 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/union/client.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/union/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.union.types.animal import Animal +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.union.animal import Animal try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/types/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/general_errors/__init__.py similarity index 55% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/types/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/general_errors/__init__.py index b6788a570..d34511a58 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/types/__init__.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/general_errors/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. from .bad_object_request_info import BadObjectRequestInfo +from .bad_request_body import BadRequestBody -__all__ = ["BadObjectRequestInfo"] +__all__ = ["BadObjectRequestInfo", "BadRequestBody"] diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/types/bad_object_request_info.py b/seed/sdk/exhaustive/no-custom-config/src/seed/general_errors/bad_object_request_info.py similarity index 93% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/types/bad_object_request_info.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/general_errors/bad_object_request_info.py index 4efd8af31..9196a5146 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/general_errors/types/bad_object_request_info.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/general_errors/bad_object_request_info.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/errors/bad_request_body.py b/seed/sdk/exhaustive/no-custom-config/src/seed/general_errors/bad_request_body.py similarity index 66% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/errors/bad_request_body.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/general_errors/bad_request_body.py index 7ca134935..0305d0248 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/errors/bad_request_body.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/general_errors/bad_request_body.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.api_error import ApiError -from ..types.bad_object_request_info import BadObjectRequestInfo +from ..core.api_error import ApiError +from .bad_object_request_info import BadObjectRequestInfo class BadRequestBody(ApiError): diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/no_auth/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/inlined_requests/__init__.py similarity index 100% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/no_auth/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/inlined_requests/__init__.py diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/inlined_requests/client.py b/seed/sdk/exhaustive/no-custom-config/src/seed/inlined_requests/_client.py similarity index 88% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/inlined_requests/client.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/inlined_requests/_client.py index 18812cbbe..9e018544d 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/inlined_requests/client.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/inlined_requests/_client.py @@ -4,12 +4,12 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..general_errors.errors.bad_request_body import BadRequestBody -from ..general_errors.types.bad_object_request_info import BadObjectRequestInfo -from ..types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..general_errors.bad_object_request_info import BadObjectRequestInfo +from ..general_errors.bad_request_body import BadRequestBody +from ..types.object.object_with_optional_field import ObjectWithOptionalField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/no_req_body/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/no_auth/__init__.py similarity index 100% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/no_req_body/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/no_auth/__init__.py diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/no_auth/client.py b/seed/sdk/exhaustive/no-custom-config/src/seed/no_auth/_client.py similarity index 89% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/no_auth/client.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/no_auth/_client.py index 403e2b970..67749148f 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/no_auth/client.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/no_auth/_client.py @@ -4,11 +4,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..general_errors.errors.bad_request_body import BadRequestBody -from ..general_errors.types.bad_object_request_info import BadObjectRequestInfo +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..general_errors.bad_object_request_info import BadObjectRequestInfo +from ..general_errors.bad_request_body import BadRequestBody try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/req_with_headers/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/no_req_body/__init__.py similarity index 100% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/req_with_headers/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/no_req_body/__init__.py diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/no_req_body/client.py b/seed/sdk/exhaustive/no-custom-config/src/seed/no_req_body/_client.py similarity index 94% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/no_req_body/client.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/no_req_body/_client.py index cfa4368a2..c197615cb 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/no_req_body/client.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/no_req_body/_client.py @@ -3,9 +3,9 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ..types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..types.object.object_with_optional_field import ObjectWithOptionalField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/container/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/req_with_headers/__init__.py similarity index 100% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/container/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/req_with_headers/__init__.py diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/req_with_headers/client.py b/seed/sdk/exhaustive/no-custom-config/src/seed/req_with_headers/_client.py similarity index 92% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/req_with_headers/client.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/req_with_headers/_client.py index ae5753b73..869c570c7 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/req_with_headers/client.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/req_with_headers/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ...core.remove_none_from_dict import remove_none_from_dict +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..core.remove_none_from_dict import remove_none_from_dict # this is used as the default value for optional parameters OMIT = typing.cast(typing.Any, ...) diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/resources/__init__.py deleted file mode 100644 index 3e6746abf..000000000 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import endpoints, general_errors, inlined_requests, no_auth, no_req_body, req_with_headers, types -from .general_errors import BadObjectRequestInfo, BadRequestBody - -__all__ = [ - "BadObjectRequestInfo", - "BadRequestBody", - "endpoints", - "general_errors", - "inlined_requests", - "no_auth", - "no_req_body", - "req_with_headers", - "types", -] diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/__init__.py deleted file mode 100644 index 466c54f1d..000000000 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import container, enum, http_methods, object, params, primitive, union - -__all__ = ["container", "enum", "http_methods", "object", "params", "primitive", "union"] diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/__init__.py deleted file mode 100644 index 57de0a862..000000000 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import BadObjectRequestInfo -from .errors import BadRequestBody - -__all__ = ["BadObjectRequestInfo", "BadRequestBody"] diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/errors/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/errors/__init__.py deleted file mode 100644 index 04eaf8e38..000000000 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/general_errors/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .bad_request_body import BadRequestBody - -__all__ = ["BadRequestBody"] diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/__init__.py deleted file mode 100644 index b54f8fbcd..000000000 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/__init__.py +++ /dev/null @@ -1,47 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import ( - Animal, - Animal_Cat, - Animal_Dog, - Cat, - Dog, - ErrorWithEnumBody, - ErrorWithUnionBody, - NestedObjectWithOptionalField, - NestedObjectWithOptionalFieldError, - NestedObjectWithRequiredField, - NestedObjectWithRequiredFieldError, - ObjectWithMapOfMap, - ObjectWithOptionalField, - ObjectWithOptionalFieldError, - ObjectWithRequiredField, - ObjectWithRequiredFieldError, - WeatherReport, - enum, - object, - union, -) - -__all__ = [ - "Animal", - "Animal_Cat", - "Animal_Dog", - "Cat", - "Dog", - "ErrorWithEnumBody", - "ErrorWithUnionBody", - "NestedObjectWithOptionalField", - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredField", - "NestedObjectWithRequiredFieldError", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredField", - "ObjectWithRequiredFieldError", - "WeatherReport", - "enum", - "object", - "union", -] diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/__init__.py deleted file mode 100644 index b1c48999a..000000000 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import WeatherReport -from .errors import ErrorWithEnumBody - -__all__ = ["ErrorWithEnumBody", "WeatherReport"] diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/types/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/types/__init__.py deleted file mode 100644 index 7a47d1fef..000000000 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/types/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .weather_report import WeatherReport - -__all__ = ["WeatherReport"] diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/__init__.py deleted file mode 100644 index 3b74145a2..000000000 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/__init__.py +++ /dev/null @@ -1,27 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - NestedObjectWithOptionalField, - NestedObjectWithRequiredField, - ObjectWithMapOfMap, - ObjectWithOptionalField, - ObjectWithRequiredField, -) -from .errors import ( - NestedObjectWithOptionalFieldError, - NestedObjectWithRequiredFieldError, - ObjectWithOptionalFieldError, - ObjectWithRequiredFieldError, -) - -__all__ = [ - "NestedObjectWithOptionalField", - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredField", - "NestedObjectWithRequiredFieldError", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredField", - "ObjectWithRequiredFieldError", -] diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/__init__.py deleted file mode 100644 index 7e7e4c63a..000000000 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .nested_object_with_optional_field_error import NestedObjectWithOptionalFieldError -from .nested_object_with_required_field_error import NestedObjectWithRequiredFieldError -from .object_with_optional_field_error import ObjectWithOptionalFieldError -from .object_with_required_field_error import ObjectWithRequiredFieldError - -__all__ = [ - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredFieldError", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredFieldError", -] diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/__init__.py deleted file mode 100644 index 30187ae02..000000000 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Animal, Animal_Cat, Animal_Dog, Cat, Dog -from .errors import ErrorWithUnionBody - -__all__ = ["Animal", "Animal_Cat", "Animal_Dog", "Cat", "Dog", "ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/errors/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/errors/__init__.py deleted file mode 100644 index 568a71fa3..000000000 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .error_with_union_body import ErrorWithUnionBody - -__all__ = ["ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/__init__.py similarity index 100% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/__init__.py diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/errors/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/enum/__init__.py similarity index 56% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/errors/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/enum/__init__.py index f5945e36d..02e5f9749 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/errors/__init__.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/enum/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. from .error_with_enum_body import ErrorWithEnumBody +from .weather_report import WeatherReport -__all__ = ["ErrorWithEnumBody"] +__all__ = ["ErrorWithEnumBody", "WeatherReport"] diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/enum/error_with_enum_body.py similarity index 68% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/enum/error_with_enum_body.py index b38481a10..1d45e9e64 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/enum/error_with_enum_body.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.weather_report import WeatherReport +from ...core.api_error import ApiError +from .weather_report import WeatherReport class ErrorWithEnumBody(ApiError): diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/types/weather_report.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/enum/weather_report.py similarity index 100% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/enum/types/weather_report.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/enum/weather_report.py diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/__init__.py similarity index 54% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/object/__init__.py index 616060b4b..5ec200ef3 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/object/types/__init__.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/__init__.py @@ -1,15 +1,23 @@ # This file was auto-generated by Fern from our API Definition. from .nested_object_with_optional_field import NestedObjectWithOptionalField +from .nested_object_with_optional_field_error import NestedObjectWithOptionalFieldError from .nested_object_with_required_field import NestedObjectWithRequiredField +from .nested_object_with_required_field_error import NestedObjectWithRequiredFieldError from .object_with_map_of_map import ObjectWithMapOfMap from .object_with_optional_field import ObjectWithOptionalField +from .object_with_optional_field_error import ObjectWithOptionalFieldError from .object_with_required_field import ObjectWithRequiredField +from .object_with_required_field_error import ObjectWithRequiredFieldError __all__ = [ "NestedObjectWithOptionalField", + "NestedObjectWithOptionalFieldError", "NestedObjectWithRequiredField", + "NestedObjectWithRequiredFieldError", "ObjectWithMapOfMap", "ObjectWithOptionalField", + "ObjectWithOptionalFieldError", "ObjectWithRequiredField", + "ObjectWithRequiredFieldError", ] diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/nested_object_with_optional_field.py similarity index 94% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/object/nested_object_with_optional_field.py index 6b4a1ab14..a36d32f15 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/nested_object_with_optional_field.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField try: diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/nested_object_with_optional_field_error.py similarity index 64% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/object/nested_object_with_optional_field_error.py index 06f5bab4a..90e6a4f4a 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/nested_object_with_optional_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.nested_object_with_optional_field import NestedObjectWithOptionalField +from ...core.api_error import ApiError +from .nested_object_with_optional_field import NestedObjectWithOptionalField class NestedObjectWithOptionalFieldError(ApiError): diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/nested_object_with_required_field.py similarity index 94% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/object/nested_object_with_required_field.py index c95accbe6..e2bfefda8 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/nested_object_with_required_field.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField try: diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/nested_object_with_required_field_error.py similarity index 64% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/object/nested_object_with_required_field_error.py index f97ea3f6d..e5236b2b2 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/nested_object_with_required_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.nested_object_with_required_field import NestedObjectWithRequiredField +from ...core.api_error import ApiError +from .nested_object_with_required_field import NestedObjectWithRequiredField class NestedObjectWithRequiredFieldError(ApiError): diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/object_with_map_of_map.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_map_of_map.py similarity index 93% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/object_with_map_of_map.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_map_of_map.py index 29f825059..1d7120705 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/object_with_map_of_map.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_map_of_map.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/object_with_optional_field.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_optional_field.py similarity index 95% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/object_with_optional_field.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_optional_field.py index 4d049137c..00520e117 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/object/types/object_with_optional_field.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_optional_field.py @@ -4,7 +4,7 @@ import typing import uuid -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_optional_field_error.py similarity index 66% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_optional_field_error.py index 0b1067ca3..1fc63749c 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_optional_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.object_with_optional_field import ObjectWithOptionalField +from ...core.api_error import ApiError +from .object_with_optional_field import ObjectWithOptionalField class ObjectWithOptionalFieldError(ApiError): diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/object_with_required_field.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_required_field.py similarity index 93% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/object_with_required_field.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_required_field.py index ca96bde6b..759fbc14b 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/types/resources/object/types/object_with_required_field.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_required_field.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_required_field_error.py similarity index 66% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_required_field_error.py index cb158d3b8..d0fef8c96 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_required_field_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from .object_with_required_field import ObjectWithRequiredField class ObjectWithRequiredFieldError(ApiError): diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/types/__init__.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/union/__init__.py similarity index 53% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/types/__init__.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/union/__init__.py index 44ff66be5..f54aac3f2 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/types/__init__.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/union/__init__.py @@ -3,5 +3,6 @@ from .animal import Animal, Animal_Cat, Animal_Dog from .cat import Cat from .dog import Dog +from .error_with_union_body import ErrorWithUnionBody -__all__ = ["Animal", "Animal_Cat", "Animal_Dog", "Cat", "Dog"] +__all__ = ["Animal", "Animal_Cat", "Animal_Dog", "Cat", "Dog", "ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/types/animal.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/union/animal.py similarity index 100% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/types/resources/union/types/animal.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/union/animal.py diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/types/cat.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/union/cat.py similarity index 94% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/types/cat.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/union/cat.py index b8dba54f6..ed422273f 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/types/cat.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/union/cat.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/types/dog.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/union/dog.py similarity index 94% rename from seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/types/dog.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/union/dog.py index 02da77f9c..47ba2ba16 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/resources/types/resources/union/types/dog.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/union/dog.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/errors/error_with_union_body.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/union/error_with_union_body.py similarity index 71% rename from seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/errors/error_with_union_body.py rename to seed/sdk/exhaustive/no-custom-config/src/seed/types/union/error_with_union_body.py index 6a4247666..2236b7d67 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/resources/types/resources/union/errors/error_with_union_body.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/union/error_with_union_body.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError -from ..types.animal import Animal +from ...core.api_error import ApiError +from .animal import Animal class ErrorWithUnionBody(ApiError): diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/__init__.py index 3616a8644..3e6746abf 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/__init__.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/__init__.py @@ -1,16 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import ( - BadObjectRequestInfo, - BadRequestBody, - endpoints, - general_errors, - inlined_requests, - no_auth, - no_req_body, - req_with_headers, - types, -) +from . import endpoints, general_errors, inlined_requests, no_auth, no_req_body, req_with_headers, types +from .general_errors import BadObjectRequestInfo, BadRequestBody __all__ = [ "BadObjectRequestInfo", diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/client.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/client.py index dbf97215f..9c7c507a7 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/client.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/client.py @@ -5,11 +5,11 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.endpoints.client import AsyncEndpointsClient, EndpointsClient -from .resources.inlined_requests.client import AsyncInlinedRequestsClient, InlinedRequestsClient -from .resources.no_auth.client import AsyncNoAuthClient, NoAuthClient -from .resources.no_req_body.client import AsyncNoReqBodyClient, NoReqBodyClient -from .resources.req_with_headers.client import AsyncReqWithHeadersClient, ReqWithHeadersClient +from .endpoints._client import AsyncEndpointsClient, EndpointsClient +from .inlined_requests._client import AsyncInlinedRequestsClient, InlinedRequestsClient +from .no_auth._client import AsyncNoAuthClient, NoAuthClient +from .no_req_body._client import AsyncNoReqBodyClient, NoReqBodyClient +from .req_with_headers._client import AsyncReqWithHeadersClient, ReqWithHeadersClient class SeedExhaustive: diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/__init__.py similarity index 100% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/__init__.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/__init__.py diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/_client.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/_client.py new file mode 100644 index 000000000..c2222257a --- /dev/null +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/_client.py @@ -0,0 +1,34 @@ +# This file was auto-generated by Fern from our API Definition. + +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .container._client import AsyncContainerClient, ContainerClient +from .enum._client import AsyncEnumClient, EnumClient +from .http_methods._client import AsyncHttpMethodsClient, HttpMethodsClient +from .object._client import AsyncObjectClient, ObjectClient +from .params._client import AsyncParamsClient, ParamsClient +from .primitive._client import AsyncPrimitiveClient, PrimitiveClient +from .union._client import AsyncUnionClient, UnionClient + + +class EndpointsClient: + def __init__(self, *, client_wrapper: SyncClientWrapper): + self._client_wrapper = client_wrapper + self.container = ContainerClient(client_wrapper=self._client_wrapper) + self.enum = EnumClient(client_wrapper=self._client_wrapper) + self.http_methods = HttpMethodsClient(client_wrapper=self._client_wrapper) + self.object = ObjectClient(client_wrapper=self._client_wrapper) + self.params = ParamsClient(client_wrapper=self._client_wrapper) + self.primitive = PrimitiveClient(client_wrapper=self._client_wrapper) + self.union = UnionClient(client_wrapper=self._client_wrapper) + + +class AsyncEndpointsClient: + def __init__(self, *, client_wrapper: AsyncClientWrapper): + self._client_wrapper = client_wrapper + self.container = AsyncContainerClient(client_wrapper=self._client_wrapper) + self.enum = AsyncEnumClient(client_wrapper=self._client_wrapper) + self.http_methods = AsyncHttpMethodsClient(client_wrapper=self._client_wrapper) + self.object = AsyncObjectClient(client_wrapper=self._client_wrapper) + self.params = AsyncParamsClient(client_wrapper=self._client_wrapper) + self.primitive = AsyncPrimitiveClient(client_wrapper=self._client_wrapper) + self.union = AsyncUnionClient(client_wrapper=self._client_wrapper) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/enum/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/container/__init__.py similarity index 100% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/enum/__init__.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/container/__init__.py diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/container/client.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/container/_client.py similarity index 98% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/container/client.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/container/_client.py index 46f5a7bb5..a2be5eada 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/container/client.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/container/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/http_methods/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/enum/__init__.py similarity index 100% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/http_methods/__init__.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/enum/__init__.py diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/enum/client.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/enum/_client.py similarity index 90% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/enum/client.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/enum/_client.py index 3d170208d..1ba552101 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/enum/client.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/enum/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.enum.types.weather_report import WeatherReport +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.enum.weather_report import WeatherReport try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/object/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/http_methods/__init__.py similarity index 100% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/object/__init__.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/http_methods/__init__.py diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/http_methods/client.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/http_methods/_client.py similarity index 96% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/http_methods/client.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/http_methods/_client.py index 051512b1c..15069936f 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/http_methods/client.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/http_methods/_client.py @@ -4,11 +4,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.object_with_optional_field import ObjectWithOptionalField +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/params/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/object/__init__.py similarity index 100% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/params/__init__.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/object/__init__.py diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/object/client.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/object/_client.py similarity index 94% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/object/client.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/object/_client.py index 760ea1337..5ac79cc2b 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/object/client.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/object/_client.py @@ -4,14 +4,14 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.nested_object_with_optional_field import NestedObjectWithOptionalField -from ....types.resources.object.types.nested_object_with_required_field import NestedObjectWithRequiredField -from ....types.resources.object.types.object_with_map_of_map import ObjectWithMapOfMap -from ....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.nested_object_with_optional_field import NestedObjectWithOptionalField +from ...types.object.nested_object_with_required_field import NestedObjectWithRequiredField +from ...types.object.object_with_map_of_map import ObjectWithMapOfMap +from ...types.object.object_with_optional_field import ObjectWithOptionalField +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/primitive/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/params/__init__.py similarity index 100% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/primitive/__init__.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/params/__init__.py diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/params/client.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/params/_client.py similarity index 97% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/params/client.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/params/_client.py index 47d962b12..d795b6954 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/params/client.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/params/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from .....core.remove_none_from_dict import remove_none_from_dict +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...core.remove_none_from_dict import remove_none_from_dict try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/union/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/primitive/__init__.py similarity index 100% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/union/__init__.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/primitive/__init__.py diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/primitive/client.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/primitive/_client.py similarity index 98% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/primitive/client.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/primitive/_client.py index ddfff18ca..187a46616 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/primitive/client.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/primitive/_client.py @@ -6,9 +6,9 @@ import uuid from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/inlined_requests/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/union/__init__.py similarity index 100% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/inlined_requests/__init__.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/union/__init__.py diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/union/client.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/union/_client.py similarity index 90% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/union/client.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/union/_client.py index a69f568c8..073ca13a5 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/union/client.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/union/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.union.types.animal import Animal +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.union.animal import Animal try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/general_errors/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/general_errors/__init__.py new file mode 100644 index 000000000..d34511a58 --- /dev/null +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/general_errors/__init__.py @@ -0,0 +1,6 @@ +# This file was auto-generated by Fern from our API Definition. + +from .bad_object_request_info import BadObjectRequestInfo +from .bad_request_body import BadRequestBody + +__all__ = ["BadObjectRequestInfo", "BadRequestBody"] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/types/bad_object_request_info.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/general_errors/bad_object_request_info.py similarity index 93% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/types/bad_object_request_info.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/general_errors/bad_object_request_info.py index 5b73d73f3..3de3089a4 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/types/bad_object_request_info.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/general_errors/bad_object_request_info.py @@ -5,7 +5,7 @@ import pydantic -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime class BadObjectRequestInfo(pydantic.BaseModel): diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/general_errors/bad_request_body.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/general_errors/bad_request_body.py new file mode 100644 index 000000000..0305d0248 --- /dev/null +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/general_errors/bad_request_body.py @@ -0,0 +1,9 @@ +# This file was auto-generated by Fern from our API Definition. + +from ..core.api_error import ApiError +from .bad_object_request_info import BadObjectRequestInfo + + +class BadRequestBody(ApiError): + def __init__(self, body: BadObjectRequestInfo): + super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/no_auth/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/inlined_requests/__init__.py similarity index 100% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/no_auth/__init__.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/inlined_requests/__init__.py diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/inlined_requests/client.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/inlined_requests/_client.py similarity index 88% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/inlined_requests/client.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/inlined_requests/_client.py index 18812cbbe..9e018544d 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/inlined_requests/client.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/inlined_requests/_client.py @@ -4,12 +4,12 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..general_errors.errors.bad_request_body import BadRequestBody -from ..general_errors.types.bad_object_request_info import BadObjectRequestInfo -from ..types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..general_errors.bad_object_request_info import BadObjectRequestInfo +from ..general_errors.bad_request_body import BadRequestBody +from ..types.object.object_with_optional_field import ObjectWithOptionalField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/no_req_body/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/no_auth/__init__.py similarity index 100% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/no_req_body/__init__.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/no_auth/__init__.py diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/no_auth/client.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/no_auth/_client.py similarity index 89% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/no_auth/client.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/no_auth/_client.py index 403e2b970..67749148f 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/no_auth/client.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/no_auth/_client.py @@ -4,11 +4,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..general_errors.errors.bad_request_body import BadRequestBody -from ..general_errors.types.bad_object_request_info import BadObjectRequestInfo +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..general_errors.bad_object_request_info import BadObjectRequestInfo +from ..general_errors.bad_request_body import BadRequestBody try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/req_with_headers/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/no_req_body/__init__.py similarity index 100% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/req_with_headers/__init__.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/no_req_body/__init__.py diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/no_req_body/client.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/no_req_body/_client.py similarity index 94% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/no_req_body/client.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/no_req_body/_client.py index cfa4368a2..c197615cb 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/no_req_body/client.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/no_req_body/_client.py @@ -3,9 +3,9 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ..types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..types.object.object_with_optional_field import ObjectWithOptionalField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/container/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/req_with_headers/__init__.py similarity index 100% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/container/__init__.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/req_with_headers/__init__.py diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/req_with_headers/client.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/req_with_headers/_client.py similarity index 92% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/req_with_headers/client.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/req_with_headers/_client.py index ae5753b73..869c570c7 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/req_with_headers/client.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/req_with_headers/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ...core.remove_none_from_dict import remove_none_from_dict +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..core.remove_none_from_dict import remove_none_from_dict # this is used as the default value for optional parameters OMIT = typing.cast(typing.Any, ...) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/__init__.py deleted file mode 100644 index 3e6746abf..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import endpoints, general_errors, inlined_requests, no_auth, no_req_body, req_with_headers, types -from .general_errors import BadObjectRequestInfo, BadRequestBody - -__all__ = [ - "BadObjectRequestInfo", - "BadRequestBody", - "endpoints", - "general_errors", - "inlined_requests", - "no_auth", - "no_req_body", - "req_with_headers", - "types", -] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/__init__.py deleted file mode 100644 index 466c54f1d..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import container, enum, http_methods, object, params, primitive, union - -__all__ = ["container", "enum", "http_methods", "object", "params", "primitive", "union"] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/client.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/client.py deleted file mode 100644 index fcfbb5adb..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/client.py +++ /dev/null @@ -1,34 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.container.client import AsyncContainerClient, ContainerClient -from .resources.enum.client import AsyncEnumClient, EnumClient -from .resources.http_methods.client import AsyncHttpMethodsClient, HttpMethodsClient -from .resources.object.client import AsyncObjectClient, ObjectClient -from .resources.params.client import AsyncParamsClient, ParamsClient -from .resources.primitive.client import AsyncPrimitiveClient, PrimitiveClient -from .resources.union.client import AsyncUnionClient, UnionClient - - -class EndpointsClient: - def __init__(self, *, client_wrapper: SyncClientWrapper): - self._client_wrapper = client_wrapper - self.container = ContainerClient(client_wrapper=self._client_wrapper) - self.enum = EnumClient(client_wrapper=self._client_wrapper) - self.http_methods = HttpMethodsClient(client_wrapper=self._client_wrapper) - self.object = ObjectClient(client_wrapper=self._client_wrapper) - self.params = ParamsClient(client_wrapper=self._client_wrapper) - self.primitive = PrimitiveClient(client_wrapper=self._client_wrapper) - self.union = UnionClient(client_wrapper=self._client_wrapper) - - -class AsyncEndpointsClient: - def __init__(self, *, client_wrapper: AsyncClientWrapper): - self._client_wrapper = client_wrapper - self.container = AsyncContainerClient(client_wrapper=self._client_wrapper) - self.enum = AsyncEnumClient(client_wrapper=self._client_wrapper) - self.http_methods = AsyncHttpMethodsClient(client_wrapper=self._client_wrapper) - self.object = AsyncObjectClient(client_wrapper=self._client_wrapper) - self.params = AsyncParamsClient(client_wrapper=self._client_wrapper) - self.primitive = AsyncPrimitiveClient(client_wrapper=self._client_wrapper) - self.union = AsyncUnionClient(client_wrapper=self._client_wrapper) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/__init__.py deleted file mode 100644 index 57de0a862..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import BadObjectRequestInfo -from .errors import BadRequestBody - -__all__ = ["BadObjectRequestInfo", "BadRequestBody"] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/errors/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/errors/__init__.py deleted file mode 100644 index 04eaf8e38..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .bad_request_body import BadRequestBody - -__all__ = ["BadRequestBody"] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/errors/bad_request_body.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/errors/bad_request_body.py deleted file mode 100644 index 7ca134935..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/errors/bad_request_body.py +++ /dev/null @@ -1,9 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ....core.api_error import ApiError -from ..types.bad_object_request_info import BadObjectRequestInfo - - -class BadRequestBody(ApiError): - def __init__(self, body: BadObjectRequestInfo): - super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/types/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/types/__init__.py deleted file mode 100644 index b6788a570..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/general_errors/types/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .bad_object_request_info import BadObjectRequestInfo - -__all__ = ["BadObjectRequestInfo"] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/__init__.py deleted file mode 100644 index b54f8fbcd..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/__init__.py +++ /dev/null @@ -1,47 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import ( - Animal, - Animal_Cat, - Animal_Dog, - Cat, - Dog, - ErrorWithEnumBody, - ErrorWithUnionBody, - NestedObjectWithOptionalField, - NestedObjectWithOptionalFieldError, - NestedObjectWithRequiredField, - NestedObjectWithRequiredFieldError, - ObjectWithMapOfMap, - ObjectWithOptionalField, - ObjectWithOptionalFieldError, - ObjectWithRequiredField, - ObjectWithRequiredFieldError, - WeatherReport, - enum, - object, - union, -) - -__all__ = [ - "Animal", - "Animal_Cat", - "Animal_Dog", - "Cat", - "Dog", - "ErrorWithEnumBody", - "ErrorWithUnionBody", - "NestedObjectWithOptionalField", - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredField", - "NestedObjectWithRequiredFieldError", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredField", - "ObjectWithRequiredFieldError", - "WeatherReport", - "enum", - "object", - "union", -] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/__init__.py deleted file mode 100644 index b1c48999a..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import WeatherReport -from .errors import ErrorWithEnumBody - -__all__ = ["ErrorWithEnumBody", "WeatherReport"] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/errors/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/errors/__init__.py deleted file mode 100644 index f5945e36d..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .error_with_enum_body import ErrorWithEnumBody - -__all__ = ["ErrorWithEnumBody"] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py deleted file mode 100644 index b38481a10..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py +++ /dev/null @@ -1,9 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ......core.api_error import ApiError -from ..types.weather_report import WeatherReport - - -class ErrorWithEnumBody(ApiError): - def __init__(self, body: WeatherReport): - super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/types/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/types/__init__.py deleted file mode 100644 index 7a47d1fef..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/types/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .weather_report import WeatherReport - -__all__ = ["WeatherReport"] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/__init__.py deleted file mode 100644 index 3b74145a2..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/__init__.py +++ /dev/null @@ -1,27 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - NestedObjectWithOptionalField, - NestedObjectWithRequiredField, - ObjectWithMapOfMap, - ObjectWithOptionalField, - ObjectWithRequiredField, -) -from .errors import ( - NestedObjectWithOptionalFieldError, - NestedObjectWithRequiredFieldError, - ObjectWithOptionalFieldError, - ObjectWithRequiredFieldError, -) - -__all__ = [ - "NestedObjectWithOptionalField", - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredField", - "NestedObjectWithRequiredFieldError", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredField", - "ObjectWithRequiredFieldError", -] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/__init__.py deleted file mode 100644 index 7e7e4c63a..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .nested_object_with_optional_field_error import NestedObjectWithOptionalFieldError -from .nested_object_with_required_field_error import NestedObjectWithRequiredFieldError -from .object_with_optional_field_error import ObjectWithOptionalFieldError -from .object_with_required_field_error import ObjectWithRequiredFieldError - -__all__ = [ - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredFieldError", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredFieldError", -] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py deleted file mode 100644 index 06f5bab4a..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py +++ /dev/null @@ -1,9 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ......core.api_error import ApiError -from ..types.nested_object_with_optional_field import NestedObjectWithOptionalField - - -class NestedObjectWithOptionalFieldError(ApiError): - def __init__(self, body: NestedObjectWithOptionalField): - super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py deleted file mode 100644 index f97ea3f6d..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py +++ /dev/null @@ -1,9 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ......core.api_error import ApiError -from ..types.nested_object_with_required_field import NestedObjectWithRequiredField - - -class NestedObjectWithRequiredFieldError(ApiError): - def __init__(self, body: NestedObjectWithRequiredField): - super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py deleted file mode 100644 index 0b1067ca3..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py +++ /dev/null @@ -1,9 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ......core.api_error import ApiError -from ..types.object_with_optional_field import ObjectWithOptionalField - - -class ObjectWithOptionalFieldError(ApiError): - def __init__(self, body: ObjectWithOptionalField): - super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py deleted file mode 100644 index cb158d3b8..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py +++ /dev/null @@ -1,9 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ......core.api_error import ApiError -from ..types.object_with_required_field import ObjectWithRequiredField - - -class ObjectWithRequiredFieldError(ApiError): - def __init__(self, body: ObjectWithRequiredField): - super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/__init__.py deleted file mode 100644 index 616060b4b..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .nested_object_with_optional_field import NestedObjectWithOptionalField -from .nested_object_with_required_field import NestedObjectWithRequiredField -from .object_with_map_of_map import ObjectWithMapOfMap -from .object_with_optional_field import ObjectWithOptionalField -from .object_with_required_field import ObjectWithRequiredField - -__all__ = [ - "NestedObjectWithOptionalField", - "NestedObjectWithRequiredField", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithRequiredField", -] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/__init__.py deleted file mode 100644 index 30187ae02..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Animal, Animal_Cat, Animal_Dog, Cat, Dog -from .errors import ErrorWithUnionBody - -__all__ = ["Animal", "Animal_Cat", "Animal_Dog", "Cat", "Dog", "ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/errors/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/errors/__init__.py deleted file mode 100644 index 568a71fa3..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .error_with_union_body import ErrorWithUnionBody - -__all__ = ["ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/errors/error_with_union_body.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/errors/error_with_union_body.py deleted file mode 100644 index 6a4247666..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/errors/error_with_union_body.py +++ /dev/null @@ -1,9 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ......core.api_error import ApiError -from ..types.animal import Animal - - -class ErrorWithUnionBody(ApiError): - def __init__(self, body: Animal): - super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/types/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/types/__init__.py deleted file mode 100644 index 44ff66be5..000000000 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/types/__init__.py +++ /dev/null @@ -1,7 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .animal import Animal, Animal_Cat, Animal_Dog -from .cat import Cat -from .dog import Dog - -__all__ = ["Animal", "Animal_Cat", "Animal_Dog", "Cat", "Dog"] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/__init__.py similarity index 100% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/__init__.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/types/__init__.py diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/types/enum/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/enum/__init__.py new file mode 100644 index 000000000..02e5f9749 --- /dev/null +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/enum/__init__.py @@ -0,0 +1,6 @@ +# This file was auto-generated by Fern from our API Definition. + +from .error_with_enum_body import ErrorWithEnumBody +from .weather_report import WeatherReport + +__all__ = ["ErrorWithEnumBody", "WeatherReport"] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/types/enum/error_with_enum_body.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/enum/error_with_enum_body.py new file mode 100644 index 000000000..1d45e9e64 --- /dev/null +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/enum/error_with_enum_body.py @@ -0,0 +1,9 @@ +# This file was auto-generated by Fern from our API Definition. + +from ...core.api_error import ApiError +from .weather_report import WeatherReport + + +class ErrorWithEnumBody(ApiError): + def __init__(self, body: WeatherReport): + super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/types/weather_report.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/enum/weather_report.py similarity index 100% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/enum/types/weather_report.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/types/enum/weather_report.py diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/__init__.py new file mode 100644 index 000000000..5ec200ef3 --- /dev/null +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/__init__.py @@ -0,0 +1,23 @@ +# This file was auto-generated by Fern from our API Definition. + +from .nested_object_with_optional_field import NestedObjectWithOptionalField +from .nested_object_with_optional_field_error import NestedObjectWithOptionalFieldError +from .nested_object_with_required_field import NestedObjectWithRequiredField +from .nested_object_with_required_field_error import NestedObjectWithRequiredFieldError +from .object_with_map_of_map import ObjectWithMapOfMap +from .object_with_optional_field import ObjectWithOptionalField +from .object_with_optional_field_error import ObjectWithOptionalFieldError +from .object_with_required_field import ObjectWithRequiredField +from .object_with_required_field_error import ObjectWithRequiredFieldError + +__all__ = [ + "NestedObjectWithOptionalField", + "NestedObjectWithOptionalFieldError", + "NestedObjectWithRequiredField", + "NestedObjectWithRequiredFieldError", + "ObjectWithMapOfMap", + "ObjectWithOptionalField", + "ObjectWithOptionalFieldError", + "ObjectWithRequiredField", + "ObjectWithRequiredFieldError", +] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/nested_object_with_optional_field.py similarity index 94% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/nested_object_with_optional_field.py index b87c57536..6c1b56c7a 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/nested_object_with_optional_field.py @@ -5,7 +5,7 @@ import pydantic -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/nested_object_with_optional_field_error.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/nested_object_with_optional_field_error.py new file mode 100644 index 000000000..90e6a4f4a --- /dev/null +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/nested_object_with_optional_field_error.py @@ -0,0 +1,9 @@ +# This file was auto-generated by Fern from our API Definition. + +from ...core.api_error import ApiError +from .nested_object_with_optional_field import NestedObjectWithOptionalField + + +class NestedObjectWithOptionalFieldError(ApiError): + def __init__(self, body: NestedObjectWithOptionalField): + super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/nested_object_with_required_field.py similarity index 94% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/nested_object_with_required_field.py index 62bee8ead..d75cf6da5 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/nested_object_with_required_field.py @@ -5,7 +5,7 @@ import pydantic -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .object_with_optional_field import ObjectWithOptionalField diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/nested_object_with_required_field_error.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/nested_object_with_required_field_error.py new file mode 100644 index 000000000..e5236b2b2 --- /dev/null +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/nested_object_with_required_field_error.py @@ -0,0 +1,9 @@ +# This file was auto-generated by Fern from our API Definition. + +from ...core.api_error import ApiError +from .nested_object_with_required_field import NestedObjectWithRequiredField + + +class NestedObjectWithRequiredFieldError(ApiError): + def __init__(self, body: NestedObjectWithRequiredField): + super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/object_with_map_of_map.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_map_of_map.py similarity index 93% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/object_with_map_of_map.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_map_of_map.py index b56cf538a..79f103d78 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/object_with_map_of_map.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_map_of_map.py @@ -5,7 +5,7 @@ import pydantic -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime class ObjectWithMapOfMap(pydantic.BaseModel): diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/object_with_optional_field.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_optional_field.py similarity index 95% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/object_with_optional_field.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_optional_field.py index e4c89b3dc..f5cba5087 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/object_with_optional_field.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_optional_field.py @@ -6,7 +6,7 @@ import pydantic -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime class ObjectWithOptionalField(pydantic.BaseModel): diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_optional_field_error.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_optional_field_error.py new file mode 100644 index 000000000..1fc63749c --- /dev/null +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_optional_field_error.py @@ -0,0 +1,9 @@ +# This file was auto-generated by Fern from our API Definition. + +from ...core.api_error import ApiError +from .object_with_optional_field import ObjectWithOptionalField + + +class ObjectWithOptionalFieldError(ApiError): + def __init__(self, body: ObjectWithOptionalField): + super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/object_with_required_field.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_required_field.py similarity index 92% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/object_with_required_field.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_required_field.py index 70da66f92..c7cc9ee33 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/object/types/object_with_required_field.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_required_field.py @@ -5,7 +5,7 @@ import pydantic -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime class ObjectWithRequiredField(pydantic.BaseModel): diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_required_field_error.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_required_field_error.py new file mode 100644 index 000000000..d0fef8c96 --- /dev/null +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_required_field_error.py @@ -0,0 +1,9 @@ +# This file was auto-generated by Fern from our API Definition. + +from ...core.api_error import ApiError +from .object_with_required_field import ObjectWithRequiredField + + +class ObjectWithRequiredFieldError(ApiError): + def __init__(self, body: ObjectWithRequiredField): + super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/__init__.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/__init__.py new file mode 100644 index 000000000..f54aac3f2 --- /dev/null +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/__init__.py @@ -0,0 +1,8 @@ +# This file was auto-generated by Fern from our API Definition. + +from .animal import Animal, Animal_Cat, Animal_Dog +from .cat import Cat +from .dog import Dog +from .error_with_union_body import ErrorWithUnionBody + +__all__ = ["Animal", "Animal_Cat", "Animal_Dog", "Cat", "Dog", "ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/types/animal.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/animal.py similarity index 100% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/types/animal.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/animal.py diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/types/cat.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/cat.py similarity index 93% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/types/cat.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/cat.py index 059cd940c..3ce626385 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/types/cat.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/cat.py @@ -5,7 +5,7 @@ import pydantic -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime class Cat(pydantic.BaseModel): diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/types/dog.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/dog.py similarity index 93% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/types/dog.py rename to seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/dog.py index 847d9a007..cf7f30466 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/types/resources/union/types/dog.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/dog.py @@ -5,7 +5,7 @@ import pydantic -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime class Dog(pydantic.BaseModel): diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/error_with_union_body.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/error_with_union_body.py new file mode 100644 index 000000000..2236b7d67 --- /dev/null +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/union/error_with_union_body.py @@ -0,0 +1,9 @@ +# This file was auto-generated by Fern from our API Definition. + +from ...core.api_error import ApiError +from .animal import Animal + + +class ErrorWithUnionBody(ApiError): + def __init__(self, body: Animal): + super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/__init__.py index 3616a8644..3e6746abf 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/__init__.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/__init__.py @@ -1,16 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import ( - BadObjectRequestInfo, - BadRequestBody, - endpoints, - general_errors, - inlined_requests, - no_auth, - no_req_body, - req_with_headers, - types, -) +from . import endpoints, general_errors, inlined_requests, no_auth, no_req_body, req_with_headers, types +from .general_errors import BadObjectRequestInfo, BadRequestBody __all__ = [ "BadObjectRequestInfo", diff --git a/seed/sdk/exhaustive/union-utils/src/seed/client.py b/seed/sdk/exhaustive/union-utils/src/seed/client.py index dbf97215f..9c7c507a7 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/client.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/client.py @@ -5,11 +5,11 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.endpoints.client import AsyncEndpointsClient, EndpointsClient -from .resources.inlined_requests.client import AsyncInlinedRequestsClient, InlinedRequestsClient -from .resources.no_auth.client import AsyncNoAuthClient, NoAuthClient -from .resources.no_req_body.client import AsyncNoReqBodyClient, NoReqBodyClient -from .resources.req_with_headers.client import AsyncReqWithHeadersClient, ReqWithHeadersClient +from .endpoints._client import AsyncEndpointsClient, EndpointsClient +from .inlined_requests._client import AsyncInlinedRequestsClient, InlinedRequestsClient +from .no_auth._client import AsyncNoAuthClient, NoAuthClient +from .no_req_body._client import AsyncNoReqBodyClient, NoReqBodyClient +from .req_with_headers._client import AsyncReqWithHeadersClient, ReqWithHeadersClient class SeedExhaustive: diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/__init__.py similarity index 100% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/__init__.py rename to seed/sdk/exhaustive/union-utils/src/seed/endpoints/__init__.py diff --git a/seed/sdk/exhaustive/union-utils/src/seed/endpoints/_client.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/_client.py new file mode 100644 index 000000000..c2222257a --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/_client.py @@ -0,0 +1,34 @@ +# This file was auto-generated by Fern from our API Definition. + +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .container._client import AsyncContainerClient, ContainerClient +from .enum._client import AsyncEnumClient, EnumClient +from .http_methods._client import AsyncHttpMethodsClient, HttpMethodsClient +from .object._client import AsyncObjectClient, ObjectClient +from .params._client import AsyncParamsClient, ParamsClient +from .primitive._client import AsyncPrimitiveClient, PrimitiveClient +from .union._client import AsyncUnionClient, UnionClient + + +class EndpointsClient: + def __init__(self, *, client_wrapper: SyncClientWrapper): + self._client_wrapper = client_wrapper + self.container = ContainerClient(client_wrapper=self._client_wrapper) + self.enum = EnumClient(client_wrapper=self._client_wrapper) + self.http_methods = HttpMethodsClient(client_wrapper=self._client_wrapper) + self.object = ObjectClient(client_wrapper=self._client_wrapper) + self.params = ParamsClient(client_wrapper=self._client_wrapper) + self.primitive = PrimitiveClient(client_wrapper=self._client_wrapper) + self.union = UnionClient(client_wrapper=self._client_wrapper) + + +class AsyncEndpointsClient: + def __init__(self, *, client_wrapper: AsyncClientWrapper): + self._client_wrapper = client_wrapper + self.container = AsyncContainerClient(client_wrapper=self._client_wrapper) + self.enum = AsyncEnumClient(client_wrapper=self._client_wrapper) + self.http_methods = AsyncHttpMethodsClient(client_wrapper=self._client_wrapper) + self.object = AsyncObjectClient(client_wrapper=self._client_wrapper) + self.params = AsyncParamsClient(client_wrapper=self._client_wrapper) + self.primitive = AsyncPrimitiveClient(client_wrapper=self._client_wrapper) + self.union = AsyncUnionClient(client_wrapper=self._client_wrapper) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/enum/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/container/__init__.py similarity index 100% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/enum/__init__.py rename to seed/sdk/exhaustive/union-utils/src/seed/endpoints/container/__init__.py diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/container/client.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/container/_client.py similarity index 98% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/container/client.py rename to seed/sdk/exhaustive/union-utils/src/seed/endpoints/container/_client.py index 46f5a7bb5..a2be5eada 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/endpoints/resources/container/client.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/container/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/http_methods/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/enum/__init__.py similarity index 100% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/http_methods/__init__.py rename to seed/sdk/exhaustive/union-utils/src/seed/endpoints/enum/__init__.py diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/enum/client.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/enum/_client.py similarity index 90% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/enum/client.py rename to seed/sdk/exhaustive/union-utils/src/seed/endpoints/enum/_client.py index 3d170208d..1ba552101 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/enum/client.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/enum/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.enum.types.weather_report import WeatherReport +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.enum.weather_report import WeatherReport try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/object/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/http_methods/__init__.py similarity index 100% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/object/__init__.py rename to seed/sdk/exhaustive/union-utils/src/seed/endpoints/http_methods/__init__.py diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/http_methods/client.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/http_methods/_client.py similarity index 96% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/http_methods/client.py rename to seed/sdk/exhaustive/union-utils/src/seed/endpoints/http_methods/_client.py index 051512b1c..15069936f 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/http_methods/client.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/http_methods/_client.py @@ -4,11 +4,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.object_with_optional_field import ObjectWithOptionalField +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/params/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/object/__init__.py similarity index 100% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/params/__init__.py rename to seed/sdk/exhaustive/union-utils/src/seed/endpoints/object/__init__.py diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/object/client.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/object/_client.py similarity index 94% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/object/client.py rename to seed/sdk/exhaustive/union-utils/src/seed/endpoints/object/_client.py index 760ea1337..5ac79cc2b 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/object/client.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/object/_client.py @@ -4,14 +4,14 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.object.types.nested_object_with_optional_field import NestedObjectWithOptionalField -from ....types.resources.object.types.nested_object_with_required_field import NestedObjectWithRequiredField -from ....types.resources.object.types.object_with_map_of_map import ObjectWithMapOfMap -from ....types.resources.object.types.object_with_optional_field import ObjectWithOptionalField -from ....types.resources.object.types.object_with_required_field import ObjectWithRequiredField +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.object.nested_object_with_optional_field import NestedObjectWithOptionalField +from ...types.object.nested_object_with_required_field import NestedObjectWithRequiredField +from ...types.object.object_with_map_of_map import ObjectWithMapOfMap +from ...types.object.object_with_optional_field import ObjectWithOptionalField +from ...types.object.object_with_required_field import ObjectWithRequiredField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/primitive/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/params/__init__.py similarity index 100% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/primitive/__init__.py rename to seed/sdk/exhaustive/union-utils/src/seed/endpoints/params/__init__.py diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/params/client.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/params/_client.py similarity index 97% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/params/client.py rename to seed/sdk/exhaustive/union-utils/src/seed/endpoints/params/_client.py index 47d962b12..d795b6954 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/params/client.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/params/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from .....core.remove_none_from_dict import remove_none_from_dict +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...core.remove_none_from_dict import remove_none_from_dict try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/union/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/primitive/__init__.py similarity index 100% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/resources/union/__init__.py rename to seed/sdk/exhaustive/union-utils/src/seed/endpoints/primitive/__init__.py diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/primitive/client.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/primitive/_client.py similarity index 98% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/primitive/client.py rename to seed/sdk/exhaustive/union-utils/src/seed/endpoints/primitive/_client.py index ddfff18ca..187a46616 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/endpoints/resources/primitive/client.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/primitive/_client.py @@ -6,9 +6,9 @@ import uuid from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/inlined_requests/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/union/__init__.py similarity index 100% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/inlined_requests/__init__.py rename to seed/sdk/exhaustive/union-utils/src/seed/endpoints/union/__init__.py diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/union/client.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/union/_client.py similarity index 90% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/union/client.py rename to seed/sdk/exhaustive/union-utils/src/seed/endpoints/union/_client.py index a69f568c8..073ca13a5 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/endpoints/resources/union/client.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/union/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from ....types.resources.union.types.animal import Animal +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from ...types.union.animal import Animal try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/union-utils/src/seed/general_errors/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/general_errors/__init__.py new file mode 100644 index 000000000..d34511a58 --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/general_errors/__init__.py @@ -0,0 +1,6 @@ +# This file was auto-generated by Fern from our API Definition. + +from .bad_object_request_info import BadObjectRequestInfo +from .bad_request_body import BadRequestBody + +__all__ = ["BadObjectRequestInfo", "BadRequestBody"] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/general_errors/bad_object_request_info.py b/seed/sdk/exhaustive/union-utils/src/seed/general_errors/bad_object_request_info.py new file mode 100644 index 000000000..9196a5146 --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/general_errors/bad_object_request_info.py @@ -0,0 +1,28 @@ +# This file was auto-generated by Fern from our API Definition. + +import datetime as dt +import typing + +from ..core.datetime_utils import serialize_datetime + +try: + import pydantic.v1 as pydantic # type: ignore +except ImportError: + import pydantic # type: ignore + + +class BadObjectRequestInfo(pydantic.BaseModel): + message: str + + def json(self, **kwargs: typing.Any) -> str: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().json(**kwargs_with_defaults) + + def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().dict(**kwargs_with_defaults) + + class Config: + frozen = True + smart_union = True + json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/general_errors/bad_request_body.py b/seed/sdk/exhaustive/union-utils/src/seed/general_errors/bad_request_body.py new file mode 100644 index 000000000..0305d0248 --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/general_errors/bad_request_body.py @@ -0,0 +1,9 @@ +# This file was auto-generated by Fern from our API Definition. + +from ..core.api_error import ApiError +from .bad_object_request_info import BadObjectRequestInfo + + +class BadRequestBody(ApiError): + def __init__(self, body: BadObjectRequestInfo): + super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/no_auth/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/inlined_requests/__init__.py similarity index 100% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/no_auth/__init__.py rename to seed/sdk/exhaustive/union-utils/src/seed/inlined_requests/__init__.py diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/inlined_requests/client.py b/seed/sdk/exhaustive/union-utils/src/seed/inlined_requests/_client.py similarity index 88% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/inlined_requests/client.py rename to seed/sdk/exhaustive/union-utils/src/seed/inlined_requests/_client.py index 18812cbbe..9e018544d 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/inlined_requests/client.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/inlined_requests/_client.py @@ -4,12 +4,12 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..general_errors.errors.bad_request_body import BadRequestBody -from ..general_errors.types.bad_object_request_info import BadObjectRequestInfo -from ..types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..general_errors.bad_object_request_info import BadObjectRequestInfo +from ..general_errors.bad_request_body import BadRequestBody +from ..types.object.object_with_optional_field import ObjectWithOptionalField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/no_req_body/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/no_auth/__init__.py similarity index 100% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/no_req_body/__init__.py rename to seed/sdk/exhaustive/union-utils/src/seed/no_auth/__init__.py diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/no_auth/client.py b/seed/sdk/exhaustive/union-utils/src/seed/no_auth/_client.py similarity index 89% rename from seed/sdk/exhaustive/no-custom-config/src/seed/resources/no_auth/client.py rename to seed/sdk/exhaustive/union-utils/src/seed/no_auth/_client.py index 403e2b970..67749148f 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/resources/no_auth/client.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/no_auth/_client.py @@ -4,11 +4,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..general_errors.errors.bad_request_body import BadRequestBody -from ..general_errors.types.bad_object_request_info import BadObjectRequestInfo +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..general_errors.bad_object_request_info import BadObjectRequestInfo +from ..general_errors.bad_request_body import BadRequestBody try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/req_with_headers/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/no_req_body/__init__.py similarity index 100% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/req_with_headers/__init__.py rename to seed/sdk/exhaustive/union-utils/src/seed/no_req_body/__init__.py diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/no_req_body/client.py b/seed/sdk/exhaustive/union-utils/src/seed/no_req_body/_client.py similarity index 94% rename from seed/sdk/exhaustive/extra_dependencies/src/seed/resources/no_req_body/client.py rename to seed/sdk/exhaustive/union-utils/src/seed/no_req_body/_client.py index cfa4368a2..c197615cb 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/resources/no_req_body/client.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/no_req_body/_client.py @@ -3,9 +3,9 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ..types.resources.object.types.object_with_optional_field import ObjectWithOptionalField +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..types.object.object_with_optional_field import ObjectWithOptionalField try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/file-download/src/seed/resources/service/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/req_with_headers/__init__.py similarity index 100% rename from seed/sdk/file-download/src/seed/resources/service/__init__.py rename to seed/sdk/exhaustive/union-utils/src/seed/req_with_headers/__init__.py diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/req_with_headers/client.py b/seed/sdk/exhaustive/union-utils/src/seed/req_with_headers/_client.py similarity index 92% rename from seed/sdk/exhaustive/pydantic-v1/src/seed/resources/req_with_headers/client.py rename to seed/sdk/exhaustive/union-utils/src/seed/req_with_headers/_client.py index ae5753b73..869c570c7 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/resources/req_with_headers/client.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/req_with_headers/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ...core.remove_none_from_dict import remove_none_from_dict +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..core.remove_none_from_dict import remove_none_from_dict # this is used as the default value for optional parameters OMIT = typing.cast(typing.Any, ...) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/__init__.py deleted file mode 100644 index 3e6746abf..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import endpoints, general_errors, inlined_requests, no_auth, no_req_body, req_with_headers, types -from .general_errors import BadObjectRequestInfo, BadRequestBody - -__all__ = [ - "BadObjectRequestInfo", - "BadRequestBody", - "endpoints", - "general_errors", - "inlined_requests", - "no_auth", - "no_req_body", - "req_with_headers", - "types", -] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/__init__.py deleted file mode 100644 index 466c54f1d..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import container, enum, http_methods, object, params, primitive, union - -__all__ = ["container", "enum", "http_methods", "object", "params", "primitive", "union"] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/client.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/client.py deleted file mode 100644 index fcfbb5adb..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/endpoints/client.py +++ /dev/null @@ -1,34 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.container.client import AsyncContainerClient, ContainerClient -from .resources.enum.client import AsyncEnumClient, EnumClient -from .resources.http_methods.client import AsyncHttpMethodsClient, HttpMethodsClient -from .resources.object.client import AsyncObjectClient, ObjectClient -from .resources.params.client import AsyncParamsClient, ParamsClient -from .resources.primitive.client import AsyncPrimitiveClient, PrimitiveClient -from .resources.union.client import AsyncUnionClient, UnionClient - - -class EndpointsClient: - def __init__(self, *, client_wrapper: SyncClientWrapper): - self._client_wrapper = client_wrapper - self.container = ContainerClient(client_wrapper=self._client_wrapper) - self.enum = EnumClient(client_wrapper=self._client_wrapper) - self.http_methods = HttpMethodsClient(client_wrapper=self._client_wrapper) - self.object = ObjectClient(client_wrapper=self._client_wrapper) - self.params = ParamsClient(client_wrapper=self._client_wrapper) - self.primitive = PrimitiveClient(client_wrapper=self._client_wrapper) - self.union = UnionClient(client_wrapper=self._client_wrapper) - - -class AsyncEndpointsClient: - def __init__(self, *, client_wrapper: AsyncClientWrapper): - self._client_wrapper = client_wrapper - self.container = AsyncContainerClient(client_wrapper=self._client_wrapper) - self.enum = AsyncEnumClient(client_wrapper=self._client_wrapper) - self.http_methods = AsyncHttpMethodsClient(client_wrapper=self._client_wrapper) - self.object = AsyncObjectClient(client_wrapper=self._client_wrapper) - self.params = AsyncParamsClient(client_wrapper=self._client_wrapper) - self.primitive = AsyncPrimitiveClient(client_wrapper=self._client_wrapper) - self.union = AsyncUnionClient(client_wrapper=self._client_wrapper) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/__init__.py deleted file mode 100644 index 57de0a862..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import BadObjectRequestInfo -from .errors import BadRequestBody - -__all__ = ["BadObjectRequestInfo", "BadRequestBody"] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/errors/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/errors/__init__.py deleted file mode 100644 index 04eaf8e38..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .bad_request_body import BadRequestBody - -__all__ = ["BadRequestBody"] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/errors/bad_request_body.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/errors/bad_request_body.py deleted file mode 100644 index 7ca134935..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/errors/bad_request_body.py +++ /dev/null @@ -1,9 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ....core.api_error import ApiError -from ..types.bad_object_request_info import BadObjectRequestInfo - - -class BadRequestBody(ApiError): - def __init__(self, body: BadObjectRequestInfo): - super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/types/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/types/__init__.py deleted file mode 100644 index b6788a570..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/types/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .bad_object_request_info import BadObjectRequestInfo - -__all__ = ["BadObjectRequestInfo"] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/types/bad_object_request_info.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/types/bad_object_request_info.py deleted file mode 100644 index 4efd8af31..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/general_errors/types/bad_object_request_info.py +++ /dev/null @@ -1,28 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -import datetime as dt -import typing - -from ....core.datetime_utils import serialize_datetime - -try: - import pydantic.v1 as pydantic # type: ignore -except ImportError: - import pydantic # type: ignore - - -class BadObjectRequestInfo(pydantic.BaseModel): - message: str - - def json(self, **kwargs: typing.Any) -> str: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().json(**kwargs_with_defaults) - - def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().dict(**kwargs_with_defaults) - - class Config: - frozen = True - smart_union = True - json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/__init__.py deleted file mode 100644 index a1bb4ed73..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/__init__.py +++ /dev/null @@ -1,43 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import ( - Animal, - Cat, - Dog, - ErrorWithEnumBody, - ErrorWithUnionBody, - NestedObjectWithOptionalField, - NestedObjectWithOptionalFieldError, - NestedObjectWithRequiredField, - NestedObjectWithRequiredFieldError, - ObjectWithMapOfMap, - ObjectWithOptionalField, - ObjectWithOptionalFieldError, - ObjectWithRequiredField, - ObjectWithRequiredFieldError, - WeatherReport, - enum, - object, - union, -) - -__all__ = [ - "Animal", - "Cat", - "Dog", - "ErrorWithEnumBody", - "ErrorWithUnionBody", - "NestedObjectWithOptionalField", - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredField", - "NestedObjectWithRequiredFieldError", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredField", - "ObjectWithRequiredFieldError", - "WeatherReport", - "enum", - "object", - "union", -] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/__init__.py deleted file mode 100644 index b1c48999a..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import WeatherReport -from .errors import ErrorWithEnumBody - -__all__ = ["ErrorWithEnumBody", "WeatherReport"] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/errors/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/errors/__init__.py deleted file mode 100644 index f5945e36d..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .error_with_enum_body import ErrorWithEnumBody - -__all__ = ["ErrorWithEnumBody"] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py deleted file mode 100644 index b38481a10..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/errors/error_with_enum_body.py +++ /dev/null @@ -1,9 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ......core.api_error import ApiError -from ..types.weather_report import WeatherReport - - -class ErrorWithEnumBody(ApiError): - def __init__(self, body: WeatherReport): - super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/types/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/types/__init__.py deleted file mode 100644 index 7a47d1fef..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/types/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .weather_report import WeatherReport - -__all__ = ["WeatherReport"] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/__init__.py deleted file mode 100644 index 3b74145a2..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/__init__.py +++ /dev/null @@ -1,27 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - NestedObjectWithOptionalField, - NestedObjectWithRequiredField, - ObjectWithMapOfMap, - ObjectWithOptionalField, - ObjectWithRequiredField, -) -from .errors import ( - NestedObjectWithOptionalFieldError, - NestedObjectWithRequiredFieldError, - ObjectWithOptionalFieldError, - ObjectWithRequiredFieldError, -) - -__all__ = [ - "NestedObjectWithOptionalField", - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredField", - "NestedObjectWithRequiredFieldError", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredField", - "ObjectWithRequiredFieldError", -] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/__init__.py deleted file mode 100644 index 7e7e4c63a..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/__init__.py +++ /dev/null @@ -1,13 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .nested_object_with_optional_field_error import NestedObjectWithOptionalFieldError -from .nested_object_with_required_field_error import NestedObjectWithRequiredFieldError -from .object_with_optional_field_error import ObjectWithOptionalFieldError -from .object_with_required_field_error import ObjectWithRequiredFieldError - -__all__ = [ - "NestedObjectWithOptionalFieldError", - "NestedObjectWithRequiredFieldError", - "ObjectWithOptionalFieldError", - "ObjectWithRequiredFieldError", -] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py deleted file mode 100644 index 06f5bab4a..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/nested_object_with_optional_field_error.py +++ /dev/null @@ -1,9 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ......core.api_error import ApiError -from ..types.nested_object_with_optional_field import NestedObjectWithOptionalField - - -class NestedObjectWithOptionalFieldError(ApiError): - def __init__(self, body: NestedObjectWithOptionalField): - super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py deleted file mode 100644 index f97ea3f6d..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/nested_object_with_required_field_error.py +++ /dev/null @@ -1,9 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ......core.api_error import ApiError -from ..types.nested_object_with_required_field import NestedObjectWithRequiredField - - -class NestedObjectWithRequiredFieldError(ApiError): - def __init__(self, body: NestedObjectWithRequiredField): - super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py deleted file mode 100644 index 0b1067ca3..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/object_with_optional_field_error.py +++ /dev/null @@ -1,9 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ......core.api_error import ApiError -from ..types.object_with_optional_field import ObjectWithOptionalField - - -class ObjectWithOptionalFieldError(ApiError): - def __init__(self, body: ObjectWithOptionalField): - super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py deleted file mode 100644 index cb158d3b8..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/errors/object_with_required_field_error.py +++ /dev/null @@ -1,9 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ......core.api_error import ApiError -from ..types.object_with_required_field import ObjectWithRequiredField - - -class ObjectWithRequiredFieldError(ApiError): - def __init__(self, body: ObjectWithRequiredField): - super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/__init__.py deleted file mode 100644 index 616060b4b..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/__init__.py +++ /dev/null @@ -1,15 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .nested_object_with_optional_field import NestedObjectWithOptionalField -from .nested_object_with_required_field import NestedObjectWithRequiredField -from .object_with_map_of_map import ObjectWithMapOfMap -from .object_with_optional_field import ObjectWithOptionalField -from .object_with_required_field import ObjectWithRequiredField - -__all__ = [ - "NestedObjectWithOptionalField", - "NestedObjectWithRequiredField", - "ObjectWithMapOfMap", - "ObjectWithOptionalField", - "ObjectWithRequiredField", -] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py deleted file mode 100644 index 6b4a1ab14..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/nested_object_with_optional_field.py +++ /dev/null @@ -1,31 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -import datetime as dt -import typing - -from ......core.datetime_utils import serialize_datetime -from .object_with_optional_field import ObjectWithOptionalField - -try: - import pydantic.v1 as pydantic # type: ignore -except ImportError: - import pydantic # type: ignore - - -class NestedObjectWithOptionalField(pydantic.BaseModel): - string: typing.Optional[str] - nested_object: typing.Optional[ObjectWithOptionalField] = pydantic.Field(alias="NestedObject") - - def json(self, **kwargs: typing.Any) -> str: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().json(**kwargs_with_defaults) - - def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().dict(**kwargs_with_defaults) - - class Config: - frozen = True - smart_union = True - allow_population_by_field_name = True - json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py deleted file mode 100644 index c95accbe6..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/nested_object_with_required_field.py +++ /dev/null @@ -1,31 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -import datetime as dt -import typing - -from ......core.datetime_utils import serialize_datetime -from .object_with_optional_field import ObjectWithOptionalField - -try: - import pydantic.v1 as pydantic # type: ignore -except ImportError: - import pydantic # type: ignore - - -class NestedObjectWithRequiredField(pydantic.BaseModel): - string: str - nested_object: ObjectWithOptionalField = pydantic.Field(alias="NestedObject") - - def json(self, **kwargs: typing.Any) -> str: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().json(**kwargs_with_defaults) - - def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().dict(**kwargs_with_defaults) - - class Config: - frozen = True - smart_union = True - allow_population_by_field_name = True - json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/object_with_map_of_map.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/object_with_map_of_map.py deleted file mode 100644 index 29f825059..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/object_with_map_of_map.py +++ /dev/null @@ -1,28 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -import datetime as dt -import typing - -from ......core.datetime_utils import serialize_datetime - -try: - import pydantic.v1 as pydantic # type: ignore -except ImportError: - import pydantic # type: ignore - - -class ObjectWithMapOfMap(pydantic.BaseModel): - map: typing.Dict[str, typing.Dict[str, str]] - - def json(self, **kwargs: typing.Any) -> str: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().json(**kwargs_with_defaults) - - def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().dict(**kwargs_with_defaults) - - class Config: - frozen = True - smart_union = True - json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/object_with_optional_field.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/object_with_optional_field.py deleted file mode 100644 index 4d049137c..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/object_with_optional_field.py +++ /dev/null @@ -1,41 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -import datetime as dt -import typing -import uuid - -from ......core.datetime_utils import serialize_datetime - -try: - import pydantic.v1 as pydantic # type: ignore -except ImportError: - import pydantic # type: ignore - - -class ObjectWithOptionalField(pydantic.BaseModel): - string: typing.Optional[str] - integer: typing.Optional[int] - long: typing.Optional[int] - double: typing.Optional[float] - bool: typing.Optional[bool] - datetime: typing.Optional[dt.datetime] - date: typing.Optional[dt.date] - uuid: typing.Optional[uuid.UUID] - base_64: typing.Optional[str] = pydantic.Field(alias="base64") - list: typing.Optional[typing.List[str]] - set: typing.Optional[typing.List[str]] - map: typing.Optional[typing.Dict[int, str]] - - def json(self, **kwargs: typing.Any) -> str: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().json(**kwargs_with_defaults) - - def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().dict(**kwargs_with_defaults) - - class Config: - frozen = True - smart_union = True - allow_population_by_field_name = True - json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/object_with_required_field.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/object_with_required_field.py deleted file mode 100644 index ca96bde6b..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/object/types/object_with_required_field.py +++ /dev/null @@ -1,28 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -import datetime as dt -import typing - -from ......core.datetime_utils import serialize_datetime - -try: - import pydantic.v1 as pydantic # type: ignore -except ImportError: - import pydantic # type: ignore - - -class ObjectWithRequiredField(pydantic.BaseModel): - string: str - - def json(self, **kwargs: typing.Any) -> str: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().json(**kwargs_with_defaults) - - def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().dict(**kwargs_with_defaults) - - class Config: - frozen = True - smart_union = True - json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/__init__.py deleted file mode 100644 index 8d4b59c9c..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Animal, Cat, Dog -from .errors import ErrorWithUnionBody - -__all__ = ["Animal", "Cat", "Dog", "ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/errors/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/errors/__init__.py deleted file mode 100644 index 568a71fa3..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .error_with_union_body import ErrorWithUnionBody - -__all__ = ["ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/errors/error_with_union_body.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/errors/error_with_union_body.py deleted file mode 100644 index 6a4247666..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/errors/error_with_union_body.py +++ /dev/null @@ -1,9 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from ......core.api_error import ApiError -from ..types.animal import Animal - - -class ErrorWithUnionBody(ApiError): - def __init__(self, body: Animal): - super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/types/cat.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/types/cat.py deleted file mode 100644 index b8dba54f6..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/types/cat.py +++ /dev/null @@ -1,30 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -import datetime as dt -import typing - -from ......core.datetime_utils import serialize_datetime - -try: - import pydantic.v1 as pydantic # type: ignore -except ImportError: - import pydantic # type: ignore - - -class Cat(pydantic.BaseModel): - name: str - likes_to_meow: bool = pydantic.Field(alias="likesToMeow") - - def json(self, **kwargs: typing.Any) -> str: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().json(**kwargs_with_defaults) - - def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().dict(**kwargs_with_defaults) - - class Config: - frozen = True - smart_union = True - allow_population_by_field_name = True - json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/types/dog.py b/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/types/dog.py deleted file mode 100644 index 02da77f9c..000000000 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/types/dog.py +++ /dev/null @@ -1,30 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -import datetime as dt -import typing - -from ......core.datetime_utils import serialize_datetime - -try: - import pydantic.v1 as pydantic # type: ignore -except ImportError: - import pydantic # type: ignore - - -class Dog(pydantic.BaseModel): - name: str - likes_to_woof: bool = pydantic.Field(alias="likesToWoof") - - def json(self, **kwargs: typing.Any) -> str: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().json(**kwargs_with_defaults) - - def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: - kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} - return super().dict(**kwargs_with_defaults) - - class Config: - frozen = True - smart_union = True - allow_population_by_field_name = True - json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/types/__init__.py similarity index 100% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/__init__.py rename to seed/sdk/exhaustive/union-utils/src/seed/types/__init__.py diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/enum/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/types/enum/__init__.py new file mode 100644 index 000000000..02e5f9749 --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/enum/__init__.py @@ -0,0 +1,6 @@ +# This file was auto-generated by Fern from our API Definition. + +from .error_with_enum_body import ErrorWithEnumBody +from .weather_report import WeatherReport + +__all__ = ["ErrorWithEnumBody", "WeatherReport"] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/enum/error_with_enum_body.py b/seed/sdk/exhaustive/union-utils/src/seed/types/enum/error_with_enum_body.py new file mode 100644 index 000000000..1d45e9e64 --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/enum/error_with_enum_body.py @@ -0,0 +1,9 @@ +# This file was auto-generated by Fern from our API Definition. + +from ...core.api_error import ApiError +from .weather_report import WeatherReport + + +class ErrorWithEnumBody(ApiError): + def __init__(self, body: WeatherReport): + super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/types/weather_report.py b/seed/sdk/exhaustive/union-utils/src/seed/types/enum/weather_report.py similarity index 100% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/enum/types/weather_report.py rename to seed/sdk/exhaustive/union-utils/src/seed/types/enum/weather_report.py diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/object/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/types/object/__init__.py new file mode 100644 index 000000000..5ec200ef3 --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/object/__init__.py @@ -0,0 +1,23 @@ +# This file was auto-generated by Fern from our API Definition. + +from .nested_object_with_optional_field import NestedObjectWithOptionalField +from .nested_object_with_optional_field_error import NestedObjectWithOptionalFieldError +from .nested_object_with_required_field import NestedObjectWithRequiredField +from .nested_object_with_required_field_error import NestedObjectWithRequiredFieldError +from .object_with_map_of_map import ObjectWithMapOfMap +from .object_with_optional_field import ObjectWithOptionalField +from .object_with_optional_field_error import ObjectWithOptionalFieldError +from .object_with_required_field import ObjectWithRequiredField +from .object_with_required_field_error import ObjectWithRequiredFieldError + +__all__ = [ + "NestedObjectWithOptionalField", + "NestedObjectWithOptionalFieldError", + "NestedObjectWithRequiredField", + "NestedObjectWithRequiredFieldError", + "ObjectWithMapOfMap", + "ObjectWithOptionalField", + "ObjectWithOptionalFieldError", + "ObjectWithRequiredField", + "ObjectWithRequiredFieldError", +] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_optional_field.py b/seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_optional_field.py new file mode 100644 index 000000000..a36d32f15 --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_optional_field.py @@ -0,0 +1,31 @@ +# This file was auto-generated by Fern from our API Definition. + +import datetime as dt +import typing + +from ...core.datetime_utils import serialize_datetime +from .object_with_optional_field import ObjectWithOptionalField + +try: + import pydantic.v1 as pydantic # type: ignore +except ImportError: + import pydantic # type: ignore + + +class NestedObjectWithOptionalField(pydantic.BaseModel): + string: typing.Optional[str] + nested_object: typing.Optional[ObjectWithOptionalField] = pydantic.Field(alias="NestedObject") + + def json(self, **kwargs: typing.Any) -> str: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().json(**kwargs_with_defaults) + + def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().dict(**kwargs_with_defaults) + + class Config: + frozen = True + smart_union = True + allow_population_by_field_name = True + json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_optional_field_error.py b/seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_optional_field_error.py new file mode 100644 index 000000000..90e6a4f4a --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_optional_field_error.py @@ -0,0 +1,9 @@ +# This file was auto-generated by Fern from our API Definition. + +from ...core.api_error import ApiError +from .nested_object_with_optional_field import NestedObjectWithOptionalField + + +class NestedObjectWithOptionalFieldError(ApiError): + def __init__(self, body: NestedObjectWithOptionalField): + super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_required_field.py b/seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_required_field.py new file mode 100644 index 000000000..e2bfefda8 --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_required_field.py @@ -0,0 +1,31 @@ +# This file was auto-generated by Fern from our API Definition. + +import datetime as dt +import typing + +from ...core.datetime_utils import serialize_datetime +from .object_with_optional_field import ObjectWithOptionalField + +try: + import pydantic.v1 as pydantic # type: ignore +except ImportError: + import pydantic # type: ignore + + +class NestedObjectWithRequiredField(pydantic.BaseModel): + string: str + nested_object: ObjectWithOptionalField = pydantic.Field(alias="NestedObject") + + def json(self, **kwargs: typing.Any) -> str: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().json(**kwargs_with_defaults) + + def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().dict(**kwargs_with_defaults) + + class Config: + frozen = True + smart_union = True + allow_population_by_field_name = True + json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_required_field_error.py b/seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_required_field_error.py new file mode 100644 index 000000000..e5236b2b2 --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/object/nested_object_with_required_field_error.py @@ -0,0 +1,9 @@ +# This file was auto-generated by Fern from our API Definition. + +from ...core.api_error import ApiError +from .nested_object_with_required_field import NestedObjectWithRequiredField + + +class NestedObjectWithRequiredFieldError(ApiError): + def __init__(self, body: NestedObjectWithRequiredField): + super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_map_of_map.py b/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_map_of_map.py new file mode 100644 index 000000000..1d7120705 --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_map_of_map.py @@ -0,0 +1,28 @@ +# This file was auto-generated by Fern from our API Definition. + +import datetime as dt +import typing + +from ...core.datetime_utils import serialize_datetime + +try: + import pydantic.v1 as pydantic # type: ignore +except ImportError: + import pydantic # type: ignore + + +class ObjectWithMapOfMap(pydantic.BaseModel): + map: typing.Dict[str, typing.Dict[str, str]] + + def json(self, **kwargs: typing.Any) -> str: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().json(**kwargs_with_defaults) + + def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().dict(**kwargs_with_defaults) + + class Config: + frozen = True + smart_union = True + json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_optional_field.py b/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_optional_field.py new file mode 100644 index 000000000..00520e117 --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_optional_field.py @@ -0,0 +1,41 @@ +# This file was auto-generated by Fern from our API Definition. + +import datetime as dt +import typing +import uuid + +from ...core.datetime_utils import serialize_datetime + +try: + import pydantic.v1 as pydantic # type: ignore +except ImportError: + import pydantic # type: ignore + + +class ObjectWithOptionalField(pydantic.BaseModel): + string: typing.Optional[str] + integer: typing.Optional[int] + long: typing.Optional[int] + double: typing.Optional[float] + bool: typing.Optional[bool] + datetime: typing.Optional[dt.datetime] + date: typing.Optional[dt.date] + uuid: typing.Optional[uuid.UUID] + base_64: typing.Optional[str] = pydantic.Field(alias="base64") + list: typing.Optional[typing.List[str]] + set: typing.Optional[typing.List[str]] + map: typing.Optional[typing.Dict[int, str]] + + def json(self, **kwargs: typing.Any) -> str: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().json(**kwargs_with_defaults) + + def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().dict(**kwargs_with_defaults) + + class Config: + frozen = True + smart_union = True + allow_population_by_field_name = True + json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_optional_field_error.py b/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_optional_field_error.py new file mode 100644 index 000000000..1fc63749c --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_optional_field_error.py @@ -0,0 +1,9 @@ +# This file was auto-generated by Fern from our API Definition. + +from ...core.api_error import ApiError +from .object_with_optional_field import ObjectWithOptionalField + + +class ObjectWithOptionalFieldError(ApiError): + def __init__(self, body: ObjectWithOptionalField): + super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_required_field.py b/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_required_field.py new file mode 100644 index 000000000..759fbc14b --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_required_field.py @@ -0,0 +1,28 @@ +# This file was auto-generated by Fern from our API Definition. + +import datetime as dt +import typing + +from ...core.datetime_utils import serialize_datetime + +try: + import pydantic.v1 as pydantic # type: ignore +except ImportError: + import pydantic # type: ignore + + +class ObjectWithRequiredField(pydantic.BaseModel): + string: str + + def json(self, **kwargs: typing.Any) -> str: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().json(**kwargs_with_defaults) + + def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().dict(**kwargs_with_defaults) + + class Config: + frozen = True + smart_union = True + json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_required_field_error.py b/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_required_field_error.py new file mode 100644 index 000000000..d0fef8c96 --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_required_field_error.py @@ -0,0 +1,9 @@ +# This file was auto-generated by Fern from our API Definition. + +from ...core.api_error import ApiError +from .object_with_required_field import ObjectWithRequiredField + + +class ObjectWithRequiredFieldError(ApiError): + def __init__(self, body: ObjectWithRequiredField): + super().__init__(status_code=400, body=body) diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/types/__init__.py b/seed/sdk/exhaustive/union-utils/src/seed/types/union/__init__.py similarity index 54% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/types/__init__.py rename to seed/sdk/exhaustive/union-utils/src/seed/types/union/__init__.py index e8c68486e..a86b3d7ec 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/types/__init__.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/union/__init__.py @@ -3,5 +3,6 @@ from .animal import Animal from .cat import Cat from .dog import Dog +from .error_with_union_body import ErrorWithUnionBody -__all__ = ["Animal", "Cat", "Dog"] +__all__ = ["Animal", "Cat", "Dog", "ErrorWithUnionBody"] diff --git a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/types/animal.py b/seed/sdk/exhaustive/union-utils/src/seed/types/union/animal.py similarity index 64% rename from seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/types/animal.py rename to seed/sdk/exhaustive/union-utils/src/seed/types/union/animal.py index 4c253de5c..86568f498 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/resources/types/resources/union/types/animal.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/union/animal.py @@ -7,9 +7,9 @@ import typing_extensions -from ......core.datetime_utils import serialize_datetime -from .cat import Cat as resources_types_resources_union_types_cat_Cat -from .dog import Dog as resources_types_resources_union_types_dog_Dog +from ...core.datetime_utils import serialize_datetime +from .cat import Cat as types_union_cat_Cat +from .dog import Dog as types_union_dog_Dog try: import pydantic.v1 as pydantic # type: ignore @@ -20,10 +20,10 @@ class _Factory: - def dog(self, value: resources_types_resources_union_types_dog_Dog) -> Animal: + def dog(self, value: types_union_dog_Dog) -> Animal: return Animal(__root__=_Animal.Dog(**value.dict(exclude_unset=True), animal="dog")) - def cat(self, value: resources_types_resources_union_types_cat_Cat) -> Animal: + def cat(self, value: types_union_cat_Cat) -> Animal: return Animal(__root__=_Animal.Cat(**value.dict(exclude_unset=True), animal="cat")) @@ -35,21 +35,13 @@ def get_as_union(self) -> typing.Union[_Animal.Dog, _Animal.Cat]: def visit( self, - dog: typing.Callable[[resources_types_resources_union_types_dog_Dog], T_Result], - cat: typing.Callable[[resources_types_resources_union_types_cat_Cat], T_Result], + dog: typing.Callable[[types_union_dog_Dog], T_Result], + cat: typing.Callable[[types_union_cat_Cat], T_Result], ) -> T_Result: if self.__root__.animal == "dog": - return dog( - resources_types_resources_union_types_dog_Dog( - **self.__root__.dict(exclude_unset=True, exclude={"animal"}) - ) - ) + return dog(types_union_dog_Dog(**self.__root__.dict(exclude_unset=True, exclude={"animal"}))) if self.__root__.animal == "cat": - return cat( - resources_types_resources_union_types_cat_Cat( - **self.__root__.dict(exclude_unset=True, exclude={"animal"}) - ) - ) + return cat(types_union_cat_Cat(**self.__root__.dict(exclude_unset=True, exclude={"animal"}))) __root__: typing_extensions.Annotated[ typing.Union[_Animal.Dog, _Animal.Cat], pydantic.Field(discriminator="animal") @@ -70,7 +62,7 @@ class Config: class _Animal: - class Dog(resources_types_resources_union_types_dog_Dog): + class Dog(types_union_dog_Dog): animal: typing_extensions.Literal["dog"] class Config: @@ -78,7 +70,7 @@ class Config: smart_union = True allow_population_by_field_name = True - class Cat(resources_types_resources_union_types_cat_Cat): + class Cat(types_union_cat_Cat): animal: typing_extensions.Literal["cat"] class Config: diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/union/cat.py b/seed/sdk/exhaustive/union-utils/src/seed/types/union/cat.py new file mode 100644 index 000000000..ed422273f --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/union/cat.py @@ -0,0 +1,30 @@ +# This file was auto-generated by Fern from our API Definition. + +import datetime as dt +import typing + +from ...core.datetime_utils import serialize_datetime + +try: + import pydantic.v1 as pydantic # type: ignore +except ImportError: + import pydantic # type: ignore + + +class Cat(pydantic.BaseModel): + name: str + likes_to_meow: bool = pydantic.Field(alias="likesToMeow") + + def json(self, **kwargs: typing.Any) -> str: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().json(**kwargs_with_defaults) + + def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().dict(**kwargs_with_defaults) + + class Config: + frozen = True + smart_union = True + allow_population_by_field_name = True + json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/union/dog.py b/seed/sdk/exhaustive/union-utils/src/seed/types/union/dog.py new file mode 100644 index 000000000..47ba2ba16 --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/union/dog.py @@ -0,0 +1,30 @@ +# This file was auto-generated by Fern from our API Definition. + +import datetime as dt +import typing + +from ...core.datetime_utils import serialize_datetime + +try: + import pydantic.v1 as pydantic # type: ignore +except ImportError: + import pydantic # type: ignore + + +class Dog(pydantic.BaseModel): + name: str + likes_to_woof: bool = pydantic.Field(alias="likesToWoof") + + def json(self, **kwargs: typing.Any) -> str: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().json(**kwargs_with_defaults) + + def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]: + kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} + return super().dict(**kwargs_with_defaults) + + class Config: + frozen = True + smart_union = True + allow_population_by_field_name = True + json_encoders = {dt.datetime: serialize_datetime} diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/union/error_with_union_body.py b/seed/sdk/exhaustive/union-utils/src/seed/types/union/error_with_union_body.py new file mode 100644 index 000000000..2236b7d67 --- /dev/null +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/union/error_with_union_body.py @@ -0,0 +1,9 @@ +# This file was auto-generated by Fern from our API Definition. + +from ...core.api_error import ApiError +from .animal import Animal + + +class ErrorWithUnionBody(ApiError): + def __init__(self, body: Animal): + super().__init__(status_code=400, body=body) diff --git a/seed/sdk/extends/src/seed/__init__.py b/seed/sdk/extends/src/seed/__init__.py index ccbfb8355..382387659 100644 --- a/seed/sdk/extends/src/seed/__init__.py +++ b/seed/sdk/extends/src/seed/__init__.py @@ -1,5 +1,8 @@ # This file was auto-generated by Fern from our API Definition. -from .types import Docs, ExampleType, Json, NestedType +from .docs import Docs +from .example_type import ExampleType +from .json import Json +from .nested_type import NestedType __all__ = ["Docs", "ExampleType", "Json", "NestedType"] diff --git a/seed/sdk/extends/src/seed/types/docs.py b/seed/sdk/extends/src/seed/docs.py similarity index 94% rename from seed/sdk/extends/src/seed/types/docs.py rename to seed/sdk/extends/src/seed/docs.py index 66594cc7c..553079cbb 100644 --- a/seed/sdk/extends/src/seed/types/docs.py +++ b/seed/sdk/extends/src/seed/docs.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ..core.datetime_utils import serialize_datetime +from .core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/extends/src/seed/types/example_type.py b/seed/sdk/extends/src/seed/example_type.py similarity index 94% rename from seed/sdk/extends/src/seed/types/example_type.py rename to seed/sdk/extends/src/seed/example_type.py index 48b8e0f3f..df3cd3b65 100644 --- a/seed/sdk/extends/src/seed/types/example_type.py +++ b/seed/sdk/extends/src/seed/example_type.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ..core.datetime_utils import serialize_datetime +from .core.datetime_utils import serialize_datetime from .docs import Docs diff --git a/seed/sdk/extends/src/seed/types/json.py b/seed/sdk/extends/src/seed/json.py similarity index 94% rename from seed/sdk/extends/src/seed/types/json.py rename to seed/sdk/extends/src/seed/json.py index 6a6b558b5..64b8c79f6 100644 --- a/seed/sdk/extends/src/seed/types/json.py +++ b/seed/sdk/extends/src/seed/json.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ..core.datetime_utils import serialize_datetime +from .core.datetime_utils import serialize_datetime from .docs import Docs diff --git a/seed/sdk/extends/src/seed/types/nested_type.py b/seed/sdk/extends/src/seed/nested_type.py similarity index 94% rename from seed/sdk/extends/src/seed/types/nested_type.py rename to seed/sdk/extends/src/seed/nested_type.py index 5f6f5d8d4..6523e8129 100644 --- a/seed/sdk/extends/src/seed/types/nested_type.py +++ b/seed/sdk/extends/src/seed/nested_type.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ..core.datetime_utils import serialize_datetime +from .core.datetime_utils import serialize_datetime from .json import Json diff --git a/seed/sdk/extends/src/seed/types/__init__.py b/seed/sdk/extends/src/seed/types/__init__.py deleted file mode 100644 index 382387659..000000000 --- a/seed/sdk/extends/src/seed/types/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .docs import Docs -from .example_type import ExampleType -from .json import Json -from .nested_type import NestedType - -__all__ = ["Docs", "ExampleType", "Json", "NestedType"] diff --git a/seed/sdk/file-download/src/seed/__init__.py b/seed/sdk/file-download/src/seed/__init__.py index e2f27dfce..43ae725f5 100644 --- a/seed/sdk/file-download/src/seed/__init__.py +++ b/seed/sdk/file-download/src/seed/__init__.py @@ -1,5 +1,5 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import service +from . import service __all__ = ["service"] diff --git a/seed/sdk/file-download/src/seed/client.py b/seed/sdk/file-download/src/seed/client.py index 4d4ec0984..d2293b846 100644 --- a/seed/sdk/file-download/src/seed/client.py +++ b/seed/sdk/file-download/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.service.client import AsyncServiceClient, ServiceClient +from .service._client import AsyncServiceClient, ServiceClient class SeedFileDownload: diff --git a/seed/sdk/file-download/src/seed/resources/__init__.py b/seed/sdk/file-download/src/seed/resources/__init__.py deleted file mode 100644 index 43ae725f5..000000000 --- a/seed/sdk/file-download/src/seed/resources/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import service - -__all__ = ["service"] diff --git a/seed/sdk/folders/src/seed/resources/a/resources/b/__init__.py b/seed/sdk/file-download/src/seed/service/__init__.py similarity index 100% rename from seed/sdk/folders/src/seed/resources/a/resources/b/__init__.py rename to seed/sdk/file-download/src/seed/service/__init__.py diff --git a/seed/sdk/file-download/src/seed/resources/service/client.py b/seed/sdk/file-download/src/seed/service/_client.py similarity index 94% rename from seed/sdk/file-download/src/seed/resources/service/client.py rename to seed/sdk/file-download/src/seed/service/_client.py index 6dff4c3de..a9eb41314 100644 --- a/seed/sdk/file-download/src/seed/resources/service/client.py +++ b/seed/sdk/file-download/src/seed/service/_client.py @@ -3,8 +3,8 @@ import typing from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper class ServiceClient: diff --git a/seed/sdk/file-upload/src/seed/__init__.py b/seed/sdk/file-upload/src/seed/__init__.py index 5a516e3b7..8f6146cfb 100644 --- a/seed/sdk/file-upload/src/seed/__init__.py +++ b/seed/sdk/file-upload/src/seed/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import MaybeList, MaybeListOrSet, MyObject, service +from . import service +from .service import MaybeList, MaybeListOrSet, MyObject __all__ = ["MaybeList", "MaybeListOrSet", "MyObject", "service"] diff --git a/seed/sdk/file-upload/src/seed/client.py b/seed/sdk/file-upload/src/seed/client.py index fd4cb7eea..00f606fa8 100644 --- a/seed/sdk/file-upload/src/seed/client.py +++ b/seed/sdk/file-upload/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.service.client import AsyncServiceClient, ServiceClient +from .service._client import AsyncServiceClient, ServiceClient class SeedFileUpload: diff --git a/seed/sdk/file-upload/src/seed/resources/__init__.py b/seed/sdk/file-upload/src/seed/resources/__init__.py deleted file mode 100644 index 8f6146cfb..000000000 --- a/seed/sdk/file-upload/src/seed/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import service -from .service import MaybeList, MaybeListOrSet, MyObject - -__all__ = ["MaybeList", "MaybeListOrSet", "MyObject", "service"] diff --git a/seed/sdk/file-upload/src/seed/resources/service/__init__.py b/seed/sdk/file-upload/src/seed/resources/service/__init__.py deleted file mode 100644 index ffcba8b33..000000000 --- a/seed/sdk/file-upload/src/seed/resources/service/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import MaybeList, MaybeListOrSet, MyObject - -__all__ = ["MaybeList", "MaybeListOrSet", "MyObject"] diff --git a/seed/sdk/file-upload/src/seed/resources/service/types/__init__.py b/seed/sdk/file-upload/src/seed/service/__init__.py similarity index 100% rename from seed/sdk/file-upload/src/seed/resources/service/types/__init__.py rename to seed/sdk/file-upload/src/seed/service/__init__.py diff --git a/seed/sdk/file-upload/src/seed/resources/service/client.py b/seed/sdk/file-upload/src/seed/service/_client.py similarity index 96% rename from seed/sdk/file-upload/src/seed/resources/service/client.py rename to seed/sdk/file-upload/src/seed/service/_client.py index c23e3ac72..c0d9c4008 100644 --- a/seed/sdk/file-upload/src/seed/resources/service/client.py +++ b/seed/sdk/file-upload/src/seed/service/_client.py @@ -4,12 +4,12 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from .types.maybe_list import MaybeList -from .types.maybe_list_or_set import MaybeListOrSet -from .types.my_object import MyObject +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from .maybe_list import MaybeList +from .maybe_list_or_set import MaybeListOrSet +from .my_object import MyObject # this is used as the default value for optional parameters OMIT = typing.cast(typing.Any, ...) diff --git a/seed/sdk/file-upload/src/seed/resources/service/types/maybe_list.py b/seed/sdk/file-upload/src/seed/service/maybe_list.py similarity index 100% rename from seed/sdk/file-upload/src/seed/resources/service/types/maybe_list.py rename to seed/sdk/file-upload/src/seed/service/maybe_list.py diff --git a/seed/sdk/file-upload/src/seed/resources/service/types/maybe_list_or_set.py b/seed/sdk/file-upload/src/seed/service/maybe_list_or_set.py similarity index 100% rename from seed/sdk/file-upload/src/seed/resources/service/types/maybe_list_or_set.py rename to seed/sdk/file-upload/src/seed/service/maybe_list_or_set.py diff --git a/seed/sdk/file-upload/src/seed/resources/service/types/my_object.py b/seed/sdk/file-upload/src/seed/service/my_object.py similarity index 93% rename from seed/sdk/file-upload/src/seed/resources/service/types/my_object.py rename to seed/sdk/file-upload/src/seed/service/my_object.py index 7d982d165..8668a11c8 100644 --- a/seed/sdk/file-upload/src/seed/resources/service/types/my_object.py +++ b/seed/sdk/file-upload/src/seed/service/my_object.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/folders/src/seed/__init__.py b/seed/sdk/folders/src/seed/__init__.py index 5cb9a124e..008b8ba12 100644 --- a/seed/sdk/folders/src/seed/__init__.py +++ b/seed/sdk/folders/src/seed/__init__.py @@ -1,5 +1,5 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import a, folder +from . import a, folder __all__ = ["a", "folder"] diff --git a/seed/sdk/folders/src/seed/resources/a/resources/__init__.py b/seed/sdk/folders/src/seed/a/__init__.py similarity index 100% rename from seed/sdk/folders/src/seed/resources/a/resources/__init__.py rename to seed/sdk/folders/src/seed/a/__init__.py diff --git a/seed/sdk/folders/src/seed/resources/a/client.py b/seed/sdk/folders/src/seed/a/_client.py similarity index 76% rename from seed/sdk/folders/src/seed/resources/a/client.py rename to seed/sdk/folders/src/seed/a/_client.py index 0c1694de8..ecd0ba987 100644 --- a/seed/sdk/folders/src/seed/resources/a/client.py +++ b/seed/sdk/folders/src/seed/a/_client.py @@ -1,8 +1,8 @@ # This file was auto-generated by Fern from our API Definition. -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.b.client import AsyncBClient, BClient -from .resources.c.client import AsyncCClient, CClient +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .b._client import AsyncBClient, BClient +from .c._client import AsyncCClient, CClient class AClient: diff --git a/seed/sdk/folders/src/seed/resources/a/resources/c/__init__.py b/seed/sdk/folders/src/seed/a/b/__init__.py similarity index 100% rename from seed/sdk/folders/src/seed/resources/a/resources/c/__init__.py rename to seed/sdk/folders/src/seed/a/b/__init__.py diff --git a/seed/sdk/folders/src/seed/resources/a/resources/b/client.py b/seed/sdk/folders/src/seed/a/b/_client.py similarity index 92% rename from seed/sdk/folders/src/seed/resources/a/resources/b/client.py rename to seed/sdk/folders/src/seed/a/b/_client.py index 01e98e9c4..418a329e5 100644 --- a/seed/sdk/folders/src/seed/resources/a/resources/b/client.py +++ b/seed/sdk/folders/src/seed/a/b/_client.py @@ -2,8 +2,8 @@ from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper class BClient: diff --git a/seed/sdk/literal-headers/src/seed/resources/no_headers/__init__.py b/seed/sdk/folders/src/seed/a/c/__init__.py similarity index 100% rename from seed/sdk/literal-headers/src/seed/resources/no_headers/__init__.py rename to seed/sdk/folders/src/seed/a/c/__init__.py diff --git a/seed/sdk/folders/src/seed/resources/a/resources/c/client.py b/seed/sdk/folders/src/seed/a/c/_client.py similarity index 92% rename from seed/sdk/folders/src/seed/resources/a/resources/c/client.py rename to seed/sdk/folders/src/seed/a/c/_client.py index b4fa4af7e..2872e44e3 100644 --- a/seed/sdk/folders/src/seed/resources/a/resources/c/client.py +++ b/seed/sdk/folders/src/seed/a/c/_client.py @@ -2,8 +2,8 @@ from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper class CClient: diff --git a/seed/sdk/folders/src/seed/resources/a/resources/d/resources/__init__.py b/seed/sdk/folders/src/seed/a/d/__init__.py similarity index 100% rename from seed/sdk/folders/src/seed/resources/a/resources/d/resources/__init__.py rename to seed/sdk/folders/src/seed/a/d/__init__.py diff --git a/seed/sdk/folders/src/seed/resources/a/resources/d/resources/types/types/__init__.py b/seed/sdk/folders/src/seed/a/d/types/__init__.py similarity index 100% rename from seed/sdk/folders/src/seed/resources/a/resources/d/resources/types/types/__init__.py rename to seed/sdk/folders/src/seed/a/d/types/__init__.py diff --git a/seed/sdk/folders/src/seed/resources/a/resources/d/resources/types/types/foo.py b/seed/sdk/folders/src/seed/a/d/types/foo.py similarity index 100% rename from seed/sdk/folders/src/seed/resources/a/resources/d/resources/types/types/foo.py rename to seed/sdk/folders/src/seed/a/d/types/foo.py diff --git a/seed/sdk/folders/src/seed/client.py b/seed/sdk/folders/src/seed/client.py index 4c501f14f..fce9560eb 100644 --- a/seed/sdk/folders/src/seed/client.py +++ b/seed/sdk/folders/src/seed/client.py @@ -5,10 +5,10 @@ import httpx +from .a._client import AClient, AsyncAClient from .core.api_error import ApiError from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.a.client import AClient, AsyncAClient -from .resources.folder.client import AsyncFolderClient, FolderClient +from .folder._client import AsyncFolderClient, FolderClient class SeedApi: diff --git a/seed/sdk/folders/src/seed/resources/folder/resources/__init__.py b/seed/sdk/folders/src/seed/folder/__init__.py similarity index 100% rename from seed/sdk/folders/src/seed/resources/folder/resources/__init__.py rename to seed/sdk/folders/src/seed/folder/__init__.py diff --git a/seed/sdk/folders/src/seed/resources/folder/client.py b/seed/sdk/folders/src/seed/folder/_client.py similarity index 89% rename from seed/sdk/folders/src/seed/resources/folder/client.py rename to seed/sdk/folders/src/seed/folder/_client.py index 87c3457dc..1599e5a56 100644 --- a/seed/sdk/folders/src/seed/resources/folder/client.py +++ b/seed/sdk/folders/src/seed/folder/_client.py @@ -2,9 +2,9 @@ from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.service.client import AsyncServiceClient, ServiceClient +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .service._client import AsyncServiceClient, ServiceClient class FolderClient: diff --git a/seed/sdk/examples/src/seed/resources/types/errors/__init__.py b/seed/sdk/folders/src/seed/folder/service/__init__.py similarity index 100% rename from seed/sdk/examples/src/seed/resources/types/errors/__init__.py rename to seed/sdk/folders/src/seed/folder/service/__init__.py diff --git a/seed/sdk/folders/src/seed/resources/folder/resources/service/client.py b/seed/sdk/folders/src/seed/folder/service/_client.py similarity index 94% rename from seed/sdk/folders/src/seed/resources/folder/resources/service/client.py rename to seed/sdk/folders/src/seed/folder/service/_client.py index 225a0b2eb..afd7a7cbf 100644 --- a/seed/sdk/folders/src/seed/resources/folder/resources/service/client.py +++ b/seed/sdk/folders/src/seed/folder/service/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .....core.jsonable_encoder import jsonable_encoder -from .errors.not_found_error import NotFoundError +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ...core.jsonable_encoder import jsonable_encoder +from .not_found_error import NotFoundError try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/folders/src/seed/resources/folder/resources/service/errors/not_found_error.py b/seed/sdk/folders/src/seed/folder/service/not_found_error.py similarity index 81% rename from seed/sdk/folders/src/seed/resources/folder/resources/service/errors/not_found_error.py rename to seed/sdk/folders/src/seed/folder/service/not_found_error.py index aa6cc422b..74ca083d8 100644 --- a/seed/sdk/folders/src/seed/resources/folder/resources/service/errors/not_found_error.py +++ b/seed/sdk/folders/src/seed/folder/service/not_found_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ......core.api_error import ApiError +from ...core.api_error import ApiError class NotFoundError(ApiError): diff --git a/seed/sdk/folders/src/seed/resources/__init__.py b/seed/sdk/folders/src/seed/resources/__init__.py deleted file mode 100644 index 008b8ba12..000000000 --- a/seed/sdk/folders/src/seed/resources/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import a, folder - -__all__ = ["a", "folder"] diff --git a/seed/sdk/folders/src/seed/resources/a/__init__.py b/seed/sdk/folders/src/seed/resources/a/__init__.py deleted file mode 100644 index 997aa6ec8..000000000 --- a/seed/sdk/folders/src/seed/resources/a/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import b, c, d - -__all__ = ["b", "c", "d"] diff --git a/seed/sdk/folders/src/seed/resources/a/resources/d/__init__.py b/seed/sdk/folders/src/seed/resources/a/resources/d/__init__.py deleted file mode 100644 index f28a62ab7..000000000 --- a/seed/sdk/folders/src/seed/resources/a/resources/d/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import Foo, types - -__all__ = ["Foo", "types"] diff --git a/seed/sdk/folders/src/seed/resources/a/resources/d/resources/types/__init__.py b/seed/sdk/folders/src/seed/resources/a/resources/d/resources/types/__init__.py deleted file mode 100644 index a06e03f9d..000000000 --- a/seed/sdk/folders/src/seed/resources/a/resources/d/resources/types/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Foo - -__all__ = ["Foo"] diff --git a/seed/sdk/folders/src/seed/resources/folder/__init__.py b/seed/sdk/folders/src/seed/resources/folder/__init__.py deleted file mode 100644 index 3ae301b06..000000000 --- a/seed/sdk/folders/src/seed/resources/folder/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import NotFoundError, service - -__all__ = ["NotFoundError", "service"] diff --git a/seed/sdk/folders/src/seed/resources/folder/resources/service/__init__.py b/seed/sdk/folders/src/seed/resources/folder/resources/service/__init__.py deleted file mode 100644 index d55123ba3..000000000 --- a/seed/sdk/folders/src/seed/resources/folder/resources/service/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .errors import NotFoundError - -__all__ = ["NotFoundError"] diff --git a/seed/sdk/folders/src/seed/resources/folder/resources/service/errors/__init__.py b/seed/sdk/folders/src/seed/resources/folder/resources/service/errors/__init__.py deleted file mode 100644 index fe174f11b..000000000 --- a/seed/sdk/folders/src/seed/resources/folder/resources/service/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .not_found_error import NotFoundError - -__all__ = ["NotFoundError"] diff --git a/seed/sdk/idempotency-headers/src/seed/__init__.py b/seed/sdk/idempotency-headers/src/seed/__init__.py index 7279ecd75..7198c6195 100644 --- a/seed/sdk/idempotency-headers/src/seed/__init__.py +++ b/seed/sdk/idempotency-headers/src/seed/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import Currency, payment +from . import payment +from .payment import Currency __all__ = ["Currency", "payment"] diff --git a/seed/sdk/idempotency-headers/src/seed/client.py b/seed/sdk/idempotency-headers/src/seed/client.py index dd2179563..34cdfe299 100644 --- a/seed/sdk/idempotency-headers/src/seed/client.py +++ b/seed/sdk/idempotency-headers/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.payment.client import AsyncPaymentClient, PaymentClient +from .payment._client import AsyncPaymentClient, PaymentClient class SeedIdempotencyHeaders: diff --git a/seed/sdk/idempotency-headers/src/seed/resources/payment/types/__init__.py b/seed/sdk/idempotency-headers/src/seed/payment/__init__.py similarity index 100% rename from seed/sdk/idempotency-headers/src/seed/resources/payment/types/__init__.py rename to seed/sdk/idempotency-headers/src/seed/payment/__init__.py diff --git a/seed/sdk/idempotency-headers/src/seed/resources/payment/client.py b/seed/sdk/idempotency-headers/src/seed/payment/_client.py similarity index 94% rename from seed/sdk/idempotency-headers/src/seed/resources/payment/client.py rename to seed/sdk/idempotency-headers/src/seed/payment/_client.py index c0194414c..5529fb458 100644 --- a/seed/sdk/idempotency-headers/src/seed/resources/payment/client.py +++ b/seed/sdk/idempotency-headers/src/seed/payment/_client.py @@ -5,11 +5,11 @@ import uuid from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ...core.remove_none_from_dict import remove_none_from_dict -from .types.currency import Currency +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..core.remove_none_from_dict import remove_none_from_dict +from .currency import Currency try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/idempotency-headers/src/seed/resources/payment/types/currency.py b/seed/sdk/idempotency-headers/src/seed/payment/currency.py similarity index 100% rename from seed/sdk/idempotency-headers/src/seed/resources/payment/types/currency.py rename to seed/sdk/idempotency-headers/src/seed/payment/currency.py diff --git a/seed/sdk/idempotency-headers/src/seed/resources/__init__.py b/seed/sdk/idempotency-headers/src/seed/resources/__init__.py deleted file mode 100644 index 7198c6195..000000000 --- a/seed/sdk/idempotency-headers/src/seed/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import payment -from .payment import Currency - -__all__ = ["Currency", "payment"] diff --git a/seed/sdk/idempotency-headers/src/seed/resources/payment/__init__.py b/seed/sdk/idempotency-headers/src/seed/resources/payment/__init__.py deleted file mode 100644 index 2f0bdd728..000000000 --- a/seed/sdk/idempotency-headers/src/seed/resources/payment/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Currency - -__all__ = ["Currency"] diff --git a/seed/sdk/imdb/src/seed/__init__.py b/seed/sdk/imdb/src/seed/__init__.py index 01f7af12b..d316eada1 100644 --- a/seed/sdk/imdb/src/seed/__init__.py +++ b/seed/sdk/imdb/src/seed/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import CreateMovieRequest, Movie, MovieDoesNotExistError, MovieId, imdb +from . import imdb +from .imdb import CreateMovieRequest, Movie, MovieDoesNotExistError, MovieId __all__ = ["CreateMovieRequest", "Movie", "MovieDoesNotExistError", "MovieId", "imdb"] diff --git a/seed/sdk/imdb/src/seed/client.py b/seed/sdk/imdb/src/seed/client.py index 02808d1a1..17fc78f93 100644 --- a/seed/sdk/imdb/src/seed/client.py +++ b/seed/sdk/imdb/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.imdb.client import AsyncImdbClient, ImdbClient +from .imdb._client import AsyncImdbClient, ImdbClient class SeedApi: diff --git a/seed/sdk/imdb/src/seed/resources/imdb/types/__init__.py b/seed/sdk/imdb/src/seed/imdb/__init__.py similarity index 55% rename from seed/sdk/imdb/src/seed/resources/imdb/types/__init__.py rename to seed/sdk/imdb/src/seed/imdb/__init__.py index 912e20716..17db659a6 100644 --- a/seed/sdk/imdb/src/seed/resources/imdb/types/__init__.py +++ b/seed/sdk/imdb/src/seed/imdb/__init__.py @@ -2,6 +2,7 @@ from .create_movie_request import CreateMovieRequest from .movie import Movie +from .movie_does_not_exist_error import MovieDoesNotExistError from .movie_id import MovieId -__all__ = ["CreateMovieRequest", "Movie", "MovieId"] +__all__ = ["CreateMovieRequest", "Movie", "MovieDoesNotExistError", "MovieId"] diff --git a/seed/sdk/imdb/src/seed/resources/imdb/client.py b/seed/sdk/imdb/src/seed/imdb/_client.py similarity index 92% rename from seed/sdk/imdb/src/seed/resources/imdb/client.py rename to seed/sdk/imdb/src/seed/imdb/_client.py index d403ba89c..34d998200 100644 --- a/seed/sdk/imdb/src/seed/resources/imdb/client.py +++ b/seed/sdk/imdb/src/seed/imdb/_client.py @@ -4,13 +4,13 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from .errors.movie_does_not_exist_error import MovieDoesNotExistError -from .types.create_movie_request import CreateMovieRequest -from .types.movie import Movie -from .types.movie_id import MovieId +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from .create_movie_request import CreateMovieRequest +from .movie import Movie +from .movie_does_not_exist_error import MovieDoesNotExistError +from .movie_id import MovieId try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/imdb/src/seed/resources/imdb/types/create_movie_request.py b/seed/sdk/imdb/src/seed/imdb/create_movie_request.py similarity index 93% rename from seed/sdk/imdb/src/seed/resources/imdb/types/create_movie_request.py rename to seed/sdk/imdb/src/seed/imdb/create_movie_request.py index 1d3a908b5..35c360b9c 100644 --- a/seed/sdk/imdb/src/seed/resources/imdb/types/create_movie_request.py +++ b/seed/sdk/imdb/src/seed/imdb/create_movie_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/imdb/src/seed/resources/imdb/types/movie.py b/seed/sdk/imdb/src/seed/imdb/movie.py similarity index 94% rename from seed/sdk/imdb/src/seed/resources/imdb/types/movie.py rename to seed/sdk/imdb/src/seed/imdb/movie.py index d57c9e1e9..0392dd813 100644 --- a/seed/sdk/imdb/src/seed/resources/imdb/types/movie.py +++ b/seed/sdk/imdb/src/seed/imdb/movie.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .movie_id import MovieId try: diff --git a/seed/sdk/imdb/src/seed/resources/imdb/errors/movie_does_not_exist_error.py b/seed/sdk/imdb/src/seed/imdb/movie_does_not_exist_error.py similarity index 72% rename from seed/sdk/imdb/src/seed/resources/imdb/errors/movie_does_not_exist_error.py rename to seed/sdk/imdb/src/seed/imdb/movie_does_not_exist_error.py index f6618b77c..032f606cc 100644 --- a/seed/sdk/imdb/src/seed/resources/imdb/errors/movie_does_not_exist_error.py +++ b/seed/sdk/imdb/src/seed/imdb/movie_does_not_exist_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.api_error import ApiError -from ..types.movie_id import MovieId +from ..core.api_error import ApiError +from .movie_id import MovieId class MovieDoesNotExistError(ApiError): diff --git a/seed/sdk/imdb/src/seed/resources/imdb/types/movie_id.py b/seed/sdk/imdb/src/seed/imdb/movie_id.py similarity index 100% rename from seed/sdk/imdb/src/seed/resources/imdb/types/movie_id.py rename to seed/sdk/imdb/src/seed/imdb/movie_id.py diff --git a/seed/sdk/imdb/src/seed/resources/__init__.py b/seed/sdk/imdb/src/seed/resources/__init__.py deleted file mode 100644 index d316eada1..000000000 --- a/seed/sdk/imdb/src/seed/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import imdb -from .imdb import CreateMovieRequest, Movie, MovieDoesNotExistError, MovieId - -__all__ = ["CreateMovieRequest", "Movie", "MovieDoesNotExistError", "MovieId", "imdb"] diff --git a/seed/sdk/imdb/src/seed/resources/imdb/__init__.py b/seed/sdk/imdb/src/seed/resources/imdb/__init__.py deleted file mode 100644 index 95c330ee4..000000000 --- a/seed/sdk/imdb/src/seed/resources/imdb/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import CreateMovieRequest, Movie, MovieId -from .errors import MovieDoesNotExistError - -__all__ = ["CreateMovieRequest", "Movie", "MovieDoesNotExistError", "MovieId"] diff --git a/seed/sdk/imdb/src/seed/resources/imdb/errors/__init__.py b/seed/sdk/imdb/src/seed/resources/imdb/errors/__init__.py deleted file mode 100644 index ebc7df8ea..000000000 --- a/seed/sdk/imdb/src/seed/resources/imdb/errors/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .movie_does_not_exist_error import MovieDoesNotExistError - -__all__ = ["MovieDoesNotExistError"] diff --git a/seed/sdk/literal-headers/src/seed/__init__.py b/seed/sdk/literal-headers/src/seed/__init__.py index 52b17eec9..eb631d452 100644 --- a/seed/sdk/literal-headers/src/seed/__init__.py +++ b/seed/sdk/literal-headers/src/seed/__init__.py @@ -1,5 +1,5 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import no_headers, only_literal_headers, with_non_literal_headers +from . import no_headers, only_literal_headers, with_non_literal_headers __all__ = ["no_headers", "only_literal_headers", "with_non_literal_headers"] diff --git a/seed/sdk/literal-headers/src/seed/client.py b/seed/sdk/literal-headers/src/seed/client.py index 0159b26c3..1f1aa34b7 100644 --- a/seed/sdk/literal-headers/src/seed/client.py +++ b/seed/sdk/literal-headers/src/seed/client.py @@ -5,9 +5,9 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.no_headers.client import AsyncNoHeadersClient, NoHeadersClient -from .resources.only_literal_headers.client import AsyncOnlyLiteralHeadersClient, OnlyLiteralHeadersClient -from .resources.with_non_literal_headers.client import AsyncWithNonLiteralHeadersClient, WithNonLiteralHeadersClient +from .no_headers._client import AsyncNoHeadersClient, NoHeadersClient +from .only_literal_headers._client import AsyncOnlyLiteralHeadersClient, OnlyLiteralHeadersClient +from .with_non_literal_headers._client import AsyncWithNonLiteralHeadersClient, WithNonLiteralHeadersClient class SeedLiteralHeaders: diff --git a/seed/sdk/literal-headers/src/seed/resources/only_literal_headers/__init__.py b/seed/sdk/literal-headers/src/seed/no_headers/__init__.py similarity index 100% rename from seed/sdk/literal-headers/src/seed/resources/only_literal_headers/__init__.py rename to seed/sdk/literal-headers/src/seed/no_headers/__init__.py diff --git a/seed/sdk/literal-headers/src/seed/resources/no_headers/client.py b/seed/sdk/literal-headers/src/seed/no_headers/_client.py similarity index 93% rename from seed/sdk/literal-headers/src/seed/resources/no_headers/client.py rename to seed/sdk/literal-headers/src/seed/no_headers/_client.py index 7143f09cb..ea2c53da8 100644 --- a/seed/sdk/literal-headers/src/seed/resources/no_headers/client.py +++ b/seed/sdk/literal-headers/src/seed/no_headers/_client.py @@ -3,8 +3,8 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper class NoHeadersClient: diff --git a/seed/sdk/literal-headers/src/seed/resources/with_non_literal_headers/__init__.py b/seed/sdk/literal-headers/src/seed/only_literal_headers/__init__.py similarity index 100% rename from seed/sdk/literal-headers/src/seed/resources/with_non_literal_headers/__init__.py rename to seed/sdk/literal-headers/src/seed/only_literal_headers/__init__.py diff --git a/seed/sdk/literal-headers/src/seed/resources/only_literal_headers/client.py b/seed/sdk/literal-headers/src/seed/only_literal_headers/_client.py similarity index 93% rename from seed/sdk/literal-headers/src/seed/resources/only_literal_headers/client.py rename to seed/sdk/literal-headers/src/seed/only_literal_headers/_client.py index e86ece716..43be80677 100644 --- a/seed/sdk/literal-headers/src/seed/resources/only_literal_headers/client.py +++ b/seed/sdk/literal-headers/src/seed/only_literal_headers/_client.py @@ -3,9 +3,9 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.remove_none_from_dict import remove_none_from_dict +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.remove_none_from_dict import remove_none_from_dict class OnlyLiteralHeadersClient: diff --git a/seed/sdk/literal-headers/src/seed/resources/__init__.py b/seed/sdk/literal-headers/src/seed/resources/__init__.py deleted file mode 100644 index eb631d452..000000000 --- a/seed/sdk/literal-headers/src/seed/resources/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import no_headers, only_literal_headers, with_non_literal_headers - -__all__ = ["no_headers", "only_literal_headers", "with_non_literal_headers"] diff --git a/seed/sdk/multi-url-environment/src/seed/resources/ec_2/__init__.py b/seed/sdk/literal-headers/src/seed/with_non_literal_headers/__init__.py similarity index 100% rename from seed/sdk/multi-url-environment/src/seed/resources/ec_2/__init__.py rename to seed/sdk/literal-headers/src/seed/with_non_literal_headers/__init__.py diff --git a/seed/sdk/literal-headers/src/seed/resources/with_non_literal_headers/client.py b/seed/sdk/literal-headers/src/seed/with_non_literal_headers/_client.py similarity index 95% rename from seed/sdk/literal-headers/src/seed/resources/with_non_literal_headers/client.py rename to seed/sdk/literal-headers/src/seed/with_non_literal_headers/_client.py index 717b1aa4c..dab60e015 100644 --- a/seed/sdk/literal-headers/src/seed/resources/with_non_literal_headers/client.py +++ b/seed/sdk/literal-headers/src/seed/with_non_literal_headers/_client.py @@ -4,9 +4,9 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.remove_none_from_dict import remove_none_from_dict +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.remove_none_from_dict import remove_none_from_dict class WithNonLiteralHeadersClient: diff --git a/seed/sdk/literal/src/seed/__init__.py b/seed/sdk/literal/src/seed/__init__.py index 374c286c9..da076ef3d 100644 --- a/seed/sdk/literal/src/seed/__init__.py +++ b/seed/sdk/literal/src/seed/__init__.py @@ -1,12 +1,12 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import ( +from . import literal +from .literal import ( CreateOptionsResponse, CreateOptionsResponse_Ok, CreateOptionsResponse_Options, Options, UndiscriminatedOptions, - literal, ) __all__ = [ diff --git a/seed/sdk/literal/src/seed/client.py b/seed/sdk/literal/src/seed/client.py index 3758a50cd..c8fa10cb9 100644 --- a/seed/sdk/literal/src/seed/client.py +++ b/seed/sdk/literal/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.literal.client import AsyncLiteralClient, LiteralClient +from .literal._client import AsyncLiteralClient, LiteralClient class SeedLiteral: diff --git a/seed/sdk/literal/src/seed/resources/literal/types/__init__.py b/seed/sdk/literal/src/seed/literal/__init__.py similarity index 100% rename from seed/sdk/literal/src/seed/resources/literal/types/__init__.py rename to seed/sdk/literal/src/seed/literal/__init__.py diff --git a/seed/sdk/literal/src/seed/resources/literal/client.py b/seed/sdk/literal/src/seed/literal/_client.py similarity index 94% rename from seed/sdk/literal/src/seed/resources/literal/client.py rename to seed/sdk/literal/src/seed/literal/_client.py index 8c35938ec..3cc3d04ab 100644 --- a/seed/sdk/literal/src/seed/resources/literal/client.py +++ b/seed/sdk/literal/src/seed/literal/_client.py @@ -6,12 +6,12 @@ import typing_extensions -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from .types.create_options_response import CreateOptionsResponse -from .types.options import Options -from .types.undiscriminated_options import UndiscriminatedOptions +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from .create_options_response import CreateOptionsResponse +from .options import Options +from .undiscriminated_options import UndiscriminatedOptions try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/literal/src/seed/resources/literal/types/create_options_response.py b/seed/sdk/literal/src/seed/literal/create_options_response.py similarity index 100% rename from seed/sdk/literal/src/seed/resources/literal/types/create_options_response.py rename to seed/sdk/literal/src/seed/literal/create_options_response.py diff --git a/seed/sdk/literal/src/seed/resources/literal/types/options.py b/seed/sdk/literal/src/seed/literal/options.py similarity index 94% rename from seed/sdk/literal/src/seed/resources/literal/types/options.py rename to seed/sdk/literal/src/seed/literal/options.py index 1fee03ad4..e76653eac 100644 --- a/seed/sdk/literal/src/seed/resources/literal/types/options.py +++ b/seed/sdk/literal/src/seed/literal/options.py @@ -5,7 +5,7 @@ import typing_extensions -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/literal/src/seed/resources/literal/types/undiscriminated_options.py b/seed/sdk/literal/src/seed/literal/undiscriminated_options.py similarity index 100% rename from seed/sdk/literal/src/seed/resources/literal/types/undiscriminated_options.py rename to seed/sdk/literal/src/seed/literal/undiscriminated_options.py diff --git a/seed/sdk/literal/src/seed/resources/__init__.py b/seed/sdk/literal/src/seed/resources/__init__.py deleted file mode 100644 index da076ef3d..000000000 --- a/seed/sdk/literal/src/seed/resources/__init__.py +++ /dev/null @@ -1,19 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import literal -from .literal import ( - CreateOptionsResponse, - CreateOptionsResponse_Ok, - CreateOptionsResponse_Options, - Options, - UndiscriminatedOptions, -) - -__all__ = [ - "CreateOptionsResponse", - "CreateOptionsResponse_Ok", - "CreateOptionsResponse_Options", - "Options", - "UndiscriminatedOptions", - "literal", -] diff --git a/seed/sdk/literal/src/seed/resources/literal/__init__.py b/seed/sdk/literal/src/seed/resources/literal/__init__.py deleted file mode 100644 index 0b1c0b3c3..000000000 --- a/seed/sdk/literal/src/seed/resources/literal/__init__.py +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - CreateOptionsResponse, - CreateOptionsResponse_Ok, - CreateOptionsResponse_Options, - Options, - UndiscriminatedOptions, -) - -__all__ = [ - "CreateOptionsResponse", - "CreateOptionsResponse_Ok", - "CreateOptionsResponse_Options", - "Options", - "UndiscriminatedOptions", -] diff --git a/seed/sdk/multi-url-environment/src/seed/__init__.py b/seed/sdk/multi-url-environment/src/seed/__init__.py index 6cbbd6dae..74a503a48 100644 --- a/seed/sdk/multi-url-environment/src/seed/__init__.py +++ b/seed/sdk/multi-url-environment/src/seed/__init__.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import ec_2, s_3 +from . import ec_2, s_3 from .environment import SeedMultiUrlEnvironmentEnvironment __all__ = ["SeedMultiUrlEnvironmentEnvironment", "ec_2", "s_3"] diff --git a/seed/sdk/multi-url-environment/src/seed/client.py b/seed/sdk/multi-url-environment/src/seed/client.py index 666c3f566..3e181e23a 100644 --- a/seed/sdk/multi-url-environment/src/seed/client.py +++ b/seed/sdk/multi-url-environment/src/seed/client.py @@ -5,9 +5,9 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .ec_2._client import AsyncEc2Client, Ec2Client from .environment import SeedMultiUrlEnvironmentEnvironment -from .resources.ec_2.client import AsyncEc2Client, Ec2Client -from .resources.s_3.client import AsyncS3Client, S3Client +from .s_3._client import AsyncS3Client, S3Client class SeedMultiUrlEnvironment: diff --git a/seed/sdk/multi-url-environment/src/seed/resources/s_3/__init__.py b/seed/sdk/multi-url-environment/src/seed/ec_2/__init__.py similarity index 100% rename from seed/sdk/multi-url-environment/src/seed/resources/s_3/__init__.py rename to seed/sdk/multi-url-environment/src/seed/ec_2/__init__.py diff --git a/seed/sdk/multi-url-environment/src/seed/resources/ec_2/client.py b/seed/sdk/multi-url-environment/src/seed/ec_2/_client.py similarity index 92% rename from seed/sdk/multi-url-environment/src/seed/resources/ec_2/client.py rename to seed/sdk/multi-url-environment/src/seed/ec_2/_client.py index 39e723421..c3185c8e0 100644 --- a/seed/sdk/multi-url-environment/src/seed/resources/ec_2/client.py +++ b/seed/sdk/multi-url-environment/src/seed/ec_2/_client.py @@ -4,9 +4,9 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder # this is used as the default value for optional parameters OMIT = typing.cast(typing.Any, ...) diff --git a/seed/sdk/multi-url-environment/src/seed/resources/__init__.py b/seed/sdk/multi-url-environment/src/seed/resources/__init__.py deleted file mode 100644 index 575fa2779..000000000 --- a/seed/sdk/multi-url-environment/src/seed/resources/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import ec_2, s_3 - -__all__ = ["ec_2", "s_3"] diff --git a/seed/sdk/no-environment/src/seed/resources/dummy/__init__.py b/seed/sdk/multi-url-environment/src/seed/s_3/__init__.py similarity index 100% rename from seed/sdk/no-environment/src/seed/resources/dummy/__init__.py rename to seed/sdk/multi-url-environment/src/seed/s_3/__init__.py diff --git a/seed/sdk/multi-url-environment/src/seed/resources/s_3/client.py b/seed/sdk/multi-url-environment/src/seed/s_3/_client.py similarity index 93% rename from seed/sdk/multi-url-environment/src/seed/resources/s_3/client.py rename to seed/sdk/multi-url-environment/src/seed/s_3/_client.py index da698053c..18d3361cf 100644 --- a/seed/sdk/multi-url-environment/src/seed/resources/s_3/client.py +++ b/seed/sdk/multi-url-environment/src/seed/s_3/_client.py @@ -4,9 +4,9 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/no-environment/src/seed/__init__.py b/seed/sdk/no-environment/src/seed/__init__.py index c7f9631f1..c0b290959 100644 --- a/seed/sdk/no-environment/src/seed/__init__.py +++ b/seed/sdk/no-environment/src/seed/__init__.py @@ -1,5 +1,5 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import dummy +from . import dummy __all__ = ["dummy"] diff --git a/seed/sdk/no-environment/src/seed/client.py b/seed/sdk/no-environment/src/seed/client.py index 3d61ea5aa..584dba706 100644 --- a/seed/sdk/no-environment/src/seed/client.py +++ b/seed/sdk/no-environment/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.dummy.client import AsyncDummyClient, DummyClient +from .dummy._client import AsyncDummyClient, DummyClient class SeedNoEnvironment: diff --git a/seed/sdk/package-yml/src/seed/resources/service/__init__.py b/seed/sdk/no-environment/src/seed/dummy/__init__.py similarity index 100% rename from seed/sdk/package-yml/src/seed/resources/service/__init__.py rename to seed/sdk/no-environment/src/seed/dummy/__init__.py diff --git a/seed/sdk/single-url-environment-default/src/seed/resources/dummy/client.py b/seed/sdk/no-environment/src/seed/dummy/_client.py similarity index 94% rename from seed/sdk/single-url-environment-default/src/seed/resources/dummy/client.py rename to seed/sdk/no-environment/src/seed/dummy/_client.py index 493911cc6..1ddf7a6e6 100644 --- a/seed/sdk/single-url-environment-default/src/seed/resources/dummy/client.py +++ b/seed/sdk/no-environment/src/seed/dummy/_client.py @@ -3,8 +3,8 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/object/src/seed/__init__.py b/seed/sdk/object/src/seed/__init__.py index ea82d8740..2b771bf54 100644 --- a/seed/sdk/object/src/seed/__init__.py +++ b/seed/sdk/object/src/seed/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .types import Name, Type +from .name import Name +from .type import Type __all__ = ["Name", "Type"] diff --git a/seed/sdk/object/src/seed/types/name.py b/seed/sdk/object/src/seed/name.py similarity index 94% rename from seed/sdk/object/src/seed/types/name.py rename to seed/sdk/object/src/seed/name.py index 52d55ef53..0a85fef27 100644 --- a/seed/sdk/object/src/seed/types/name.py +++ b/seed/sdk/object/src/seed/name.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ..core.datetime_utils import serialize_datetime +from .core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/object/src/seed/types/type.py b/seed/sdk/object/src/seed/type.py similarity index 97% rename from seed/sdk/object/src/seed/types/type.py rename to seed/sdk/object/src/seed/type.py index e5d919591..a07256bc4 100644 --- a/seed/sdk/object/src/seed/types/type.py +++ b/seed/sdk/object/src/seed/type.py @@ -6,7 +6,7 @@ import typing_extensions -from ..core.datetime_utils import serialize_datetime +from .core.datetime_utils import serialize_datetime from .name import Name try: diff --git a/seed/sdk/object/src/seed/types/__init__.py b/seed/sdk/object/src/seed/types/__init__.py deleted file mode 100644 index 2b771bf54..000000000 --- a/seed/sdk/object/src/seed/types/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .name import Name -from .type import Type - -__all__ = ["Name", "Type"] diff --git a/seed/sdk/objects-with-imports/snippet.json b/seed/sdk/objects-with-imports/snippet.json index 0c2be1cb1..97725cd5e 100644 --- a/seed/sdk/objects-with-imports/snippet.json +++ b/seed/sdk/objects-with-imports/snippet.json @@ -1,11 +1,11 @@ { "types": { - "type_:Node": "from seed import Node\nfrom seed.resources.commons import Metadata\n\nNode(\n id=\"node-8dvgfja2\",\n label=\"left\",\n metadata=Metadata(\n id=\"metadata-kjasf923\",\n data={\"foo\": \"bar\", \"baz\": \"qux\"},\n ),\n)\n", - "type_:Tree": "from seed import Node, Tree\nfrom seed.resources.commons import Metadata\n\nTree(\n nodes=[\n Node(\n id=\"node-8dvgfja2\",\n label=\"left\",\n metadata=Metadata(\n id=\"metadata-kjasf923\",\n data={\"foo\": \"bar\", \"baz\": \"qux\"},\n ),\n ),\n Node(\n id=\"node-cwda9fi2x\",\n label=\"right\",\n metadata=Metadata(\n id=\"metadata-lkasdfv9j\",\n data={\"one\": \"two\", \"three\": \"four\"},\n ),\n ),\n ],\n)\n", - "type_commons/metadata:Metadata": "from seed.resources.commons import Metadata\n\nMetadata(\n id=\"metadata-js8dg24b\",\n data={\"foo\": \"bar\", \"baz\": \"qux\"},\n)\n", + "type_:Node": "from seed import Node\nfrom seed.commons import Metadata\n\nNode(\n id=\"node-8dvgfja2\",\n label=\"left\",\n metadata=Metadata(\n id=\"metadata-kjasf923\",\n data={\"foo\": \"bar\", \"baz\": \"qux\"},\n ),\n)\n", + "type_:Tree": "from seed import Node, Tree\nfrom seed.commons import Metadata\n\nTree(\n nodes=[\n Node(\n id=\"node-8dvgfja2\",\n label=\"left\",\n metadata=Metadata(\n id=\"metadata-kjasf923\",\n data={\"foo\": \"bar\", \"baz\": \"qux\"},\n ),\n ),\n Node(\n id=\"node-cwda9fi2x\",\n label=\"right\",\n metadata=Metadata(\n id=\"metadata-lkasdfv9j\",\n data={\"one\": \"two\", \"three\": \"four\"},\n ),\n ),\n ],\n)\n", + "type_commons/metadata:Metadata": "from seed.commons import Metadata\n\nMetadata(\n id=\"metadata-js8dg24b\",\n data={\"foo\": \"bar\", \"baz\": \"qux\"},\n)\n", "type_file:File": "from seed import File, FileInfo\n\nFile(\n name=\"file.txt\",\n contents=\"...\",\n info=FileInfo.REGULAR,\n)\n", "type_file:FileInfo": "from seed import FileInfo\n\nFileInfo.REGULAR\n", - "type_file/directory:Directory": "from seed import File, FileInfo\nfrom seed.resources.file import Directory\n\nDirectory(\n name=\"root\",\n files=[\n File(\n name=\"file.txt\",\n contents=\"...\",\n info=FileInfo.REGULAR,\n )\n ],\n directories=[\n Directory(\n name=\"tmp\",\n files=[\n File(\n name=\"another_file.txt\",\n contents=\"...\",\n info=FileInfo.REGULAR,\n )\n ],\n )\n ],\n)\n" + "type_file/directory:Directory": "from seed import File, FileInfo\nfrom seed.file import Directory\n\nDirectory(\n name=\"root\",\n files=[\n File(\n name=\"file.txt\",\n contents=\"...\",\n info=FileInfo.REGULAR,\n )\n ],\n directories=[\n Directory(\n name=\"tmp\",\n files=[\n File(\n name=\"another_file.txt\",\n contents=\"...\",\n info=FileInfo.REGULAR,\n )\n ],\n )\n ],\n)\n" }, "endpoints": [] } \ No newline at end of file diff --git a/seed/sdk/objects-with-imports/src/seed/__init__.py b/seed/sdk/objects-with-imports/src/seed/__init__.py index f84701cf7..dd28bacbf 100644 --- a/seed/sdk/objects-with-imports/src/seed/__init__.py +++ b/seed/sdk/objects-with-imports/src/seed/__init__.py @@ -1,6 +1,8 @@ # This file was auto-generated by Fern from our API Definition. -from .types import Node, Tree -from .resources import File, FileInfo, commons, file +from . import commons, file +from .file import File, FileInfo +from .node import Node +from .tree import Tree __all__ = ["File", "FileInfo", "Node", "Tree", "commons", "file"] diff --git a/seed/sdk/objects-with-imports/src/seed/resources/commons/resources/__init__.py b/seed/sdk/objects-with-imports/src/seed/commons/__init__.py similarity index 100% rename from seed/sdk/objects-with-imports/src/seed/resources/commons/resources/__init__.py rename to seed/sdk/objects-with-imports/src/seed/commons/__init__.py diff --git a/seed/sdk/objects-with-imports/src/seed/resources/commons/resources/metadata/types/__init__.py b/seed/sdk/objects-with-imports/src/seed/commons/metadata/__init__.py similarity index 100% rename from seed/sdk/objects-with-imports/src/seed/resources/commons/resources/metadata/types/__init__.py rename to seed/sdk/objects-with-imports/src/seed/commons/metadata/__init__.py diff --git a/seed/sdk/objects-with-imports/src/seed/resources/commons/resources/metadata/types/metadata.py b/seed/sdk/objects-with-imports/src/seed/commons/metadata/metadata.py similarity index 90% rename from seed/sdk/objects-with-imports/src/seed/resources/commons/resources/metadata/types/metadata.py rename to seed/sdk/objects-with-imports/src/seed/commons/metadata/metadata.py index c433052f1..5ece0c31f 100644 --- a/seed/sdk/objects-with-imports/src/seed/resources/commons/resources/metadata/types/metadata.py +++ b/seed/sdk/objects-with-imports/src/seed/commons/metadata/metadata.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore @@ -13,7 +13,7 @@ class Metadata(pydantic.BaseModel): """ - from seed.resources.commons import Metadata + from seed.commons import Metadata Metadata( id="metadata-js8dg24b", diff --git a/seed/fastapi/objects-with-imports/resources/file/resources/__init__.py b/seed/sdk/objects-with-imports/src/seed/file/__init__.py similarity index 52% rename from seed/fastapi/objects-with-imports/resources/file/resources/__init__.py rename to seed/sdk/objects-with-imports/src/seed/file/__init__.py index ed52c0aa0..dfec81a86 100644 --- a/seed/fastapi/objects-with-imports/resources/file/resources/__init__.py +++ b/seed/sdk/objects-with-imports/src/seed/file/__init__.py @@ -2,5 +2,7 @@ from . import directory from .directory import Directory +from .file import File +from .file_info import FileInfo -__all__ = ["Directory", "directory"] +__all__ = ["Directory", "File", "FileInfo", "directory"] diff --git a/seed/sdk/objects-with-imports/src/seed/resources/file/resources/directory/types/__init__.py b/seed/sdk/objects-with-imports/src/seed/file/directory/__init__.py similarity index 100% rename from seed/sdk/objects-with-imports/src/seed/resources/file/resources/directory/types/__init__.py rename to seed/sdk/objects-with-imports/src/seed/file/directory/__init__.py diff --git a/seed/sdk/objects-with-imports/src/seed/resources/file/resources/directory/types/directory.py b/seed/sdk/objects-with-imports/src/seed/file/directory/directory.py similarity index 92% rename from seed/sdk/objects-with-imports/src/seed/resources/file/resources/directory/types/directory.py rename to seed/sdk/objects-with-imports/src/seed/file/directory/directory.py index 8d588ad01..58f79d6df 100644 --- a/seed/sdk/objects-with-imports/src/seed/resources/file/resources/directory/types/directory.py +++ b/seed/sdk/objects-with-imports/src/seed/file/directory/directory.py @@ -5,8 +5,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from ....types.file import File +from ...core.datetime_utils import serialize_datetime +from ..file import File try: import pydantic.v1 as pydantic # type: ignore @@ -17,7 +17,7 @@ class Directory(pydantic.BaseModel): """ from seed import File, FileInfo - from seed.resources.file import Directory + from seed.file import Directory Directory( name="root", diff --git a/seed/sdk/objects-with-imports/src/seed/resources/file/types/file.py b/seed/sdk/objects-with-imports/src/seed/file/file.py similarity index 94% rename from seed/sdk/objects-with-imports/src/seed/resources/file/types/file.py rename to seed/sdk/objects-with-imports/src/seed/file/file.py index cc7c3fd2c..cc3e4fff1 100644 --- a/seed/sdk/objects-with-imports/src/seed/resources/file/types/file.py +++ b/seed/sdk/objects-with-imports/src/seed/file/file.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .file_info import FileInfo try: diff --git a/seed/sdk/objects-with-imports/src/seed/resources/file/types/file_info.py b/seed/sdk/objects-with-imports/src/seed/file/file_info.py similarity index 100% rename from seed/sdk/objects-with-imports/src/seed/resources/file/types/file_info.py rename to seed/sdk/objects-with-imports/src/seed/file/file_info.py diff --git a/seed/sdk/objects-with-imports/src/seed/types/node.py b/seed/sdk/objects-with-imports/src/seed/node.py similarity index 86% rename from seed/sdk/objects-with-imports/src/seed/types/node.py rename to seed/sdk/objects-with-imports/src/seed/node.py index 647e2b0ec..7cbcf6b37 100644 --- a/seed/sdk/objects-with-imports/src/seed/types/node.py +++ b/seed/sdk/objects-with-imports/src/seed/node.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ..core.datetime_utils import serialize_datetime -from ..resources.commons.resources.metadata.types.metadata import Metadata +from .commons.metadata.metadata import Metadata +from .core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore @@ -15,7 +15,7 @@ class Node(pydantic.BaseModel): """ from seed import Node - from seed.resources.commons import Metadata + from seed.commons import Metadata Node( id="node-8dvgfja2", diff --git a/seed/sdk/objects-with-imports/src/seed/resources/__init__.py b/seed/sdk/objects-with-imports/src/seed/resources/__init__.py deleted file mode 100644 index 73e0efa3a..000000000 --- a/seed/sdk/objects-with-imports/src/seed/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import commons, file -from .file import File, FileInfo - -__all__ = ["File", "FileInfo", "commons", "file"] diff --git a/seed/sdk/objects-with-imports/src/seed/resources/commons/__init__.py b/seed/sdk/objects-with-imports/src/seed/resources/commons/__init__.py deleted file mode 100644 index 4680e1e1f..000000000 --- a/seed/sdk/objects-with-imports/src/seed/resources/commons/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import Metadata, metadata - -__all__ = ["Metadata", "metadata"] diff --git a/seed/sdk/objects-with-imports/src/seed/resources/commons/resources/metadata/__init__.py b/seed/sdk/objects-with-imports/src/seed/resources/commons/resources/metadata/__init__.py deleted file mode 100644 index e8376684e..000000000 --- a/seed/sdk/objects-with-imports/src/seed/resources/commons/resources/metadata/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Metadata - -__all__ = ["Metadata"] diff --git a/seed/sdk/objects-with-imports/src/seed/resources/file/__init__.py b/seed/sdk/objects-with-imports/src/seed/resources/file/__init__.py deleted file mode 100644 index fc38002aa..000000000 --- a/seed/sdk/objects-with-imports/src/seed/resources/file/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import File, FileInfo -from .resources import Directory, directory - -__all__ = ["Directory", "File", "FileInfo", "directory"] diff --git a/seed/sdk/objects-with-imports/src/seed/resources/file/resources/__init__.py b/seed/sdk/objects-with-imports/src/seed/resources/file/resources/__init__.py deleted file mode 100644 index ed52c0aa0..000000000 --- a/seed/sdk/objects-with-imports/src/seed/resources/file/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import directory -from .directory import Directory - -__all__ = ["Directory", "directory"] diff --git a/seed/sdk/objects-with-imports/src/seed/resources/file/resources/directory/__init__.py b/seed/sdk/objects-with-imports/src/seed/resources/file/resources/directory/__init__.py deleted file mode 100644 index 818c7955f..000000000 --- a/seed/sdk/objects-with-imports/src/seed/resources/file/resources/directory/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Directory - -__all__ = ["Directory"] diff --git a/seed/sdk/objects-with-imports/src/seed/resources/file/types/__init__.py b/seed/sdk/objects-with-imports/src/seed/resources/file/types/__init__.py deleted file mode 100644 index c368f633c..000000000 --- a/seed/sdk/objects-with-imports/src/seed/resources/file/types/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .file import File -from .file_info import FileInfo - -__all__ = ["File", "FileInfo"] diff --git a/seed/sdk/objects-with-imports/src/seed/types/tree.py b/seed/sdk/objects-with-imports/src/seed/tree.py similarity index 93% rename from seed/sdk/objects-with-imports/src/seed/types/tree.py rename to seed/sdk/objects-with-imports/src/seed/tree.py index be0fb3208..cc8ae39cc 100644 --- a/seed/sdk/objects-with-imports/src/seed/types/tree.py +++ b/seed/sdk/objects-with-imports/src/seed/tree.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ..core.datetime_utils import serialize_datetime +from .core.datetime_utils import serialize_datetime from .node import Node try: @@ -15,7 +15,7 @@ class Tree(pydantic.BaseModel): """ from seed import Node, Tree - from seed.resources.commons import Metadata + from seed.commons import Metadata Tree( nodes=[ diff --git a/seed/sdk/objects-with-imports/src/seed/types/__init__.py b/seed/sdk/objects-with-imports/src/seed/types/__init__.py deleted file mode 100644 index 41c664c55..000000000 --- a/seed/sdk/objects-with-imports/src/seed/types/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .node import Node -from .tree import Tree - -__all__ = ["Node", "Tree"] diff --git a/seed/sdk/optional/.github/workflows/ci.yml b/seed/sdk/optional/.github/workflows/ci.yml new file mode 100644 index 000000000..e70067b9a --- /dev/null +++ b/seed/sdk/optional/.github/workflows/ci.yml @@ -0,0 +1,36 @@ +name: ci + +on: [push] +jobs: + compile: + runs-on: ubuntu-20.04 + steps: + - name: Checkout repo + uses: actions/checkout@v3 + - name: Set up python + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: Bootstrap poetry + run: | + curl -sSL https://install.python-poetry.org | python - -y --version 1.5.1 + - name: Install dependencies + run: poetry install + - name: Compile + run: poetry run mypy . + test: + runs-on: ubuntu-20.04 + steps: + - name: Checkout repo + uses: actions/checkout@v3 + - name: Set up python + uses: actions/setup-python@v4 + with: + python-version: 3.7 + - name: Bootstrap poetry + run: | + curl -sSL https://install.python-poetry.org | python - -y --version 1.5.1 + - name: Install dependencies + run: poetry install + - name: Test + run: poetry run pytest . diff --git a/seed/sdk/optional/.gitignore b/seed/sdk/optional/.gitignore new file mode 100644 index 000000000..42cb86350 --- /dev/null +++ b/seed/sdk/optional/.gitignore @@ -0,0 +1,4 @@ +dist/ +.mypy_cache/ +__pycache__/ +poetry.toml diff --git a/seed/sdk/optional/README.md b/seed/sdk/optional/README.md new file mode 100644 index 000000000..e69de29bb diff --git a/seed/sdk/optional/poetry.lock b/seed/sdk/optional/poetry.lock new file mode 100644 index 000000000..65ab80091 --- /dev/null +++ b/seed/sdk/optional/poetry.lock @@ -0,0 +1,519 @@ +# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. + +[[package]] +name = "annotated-types" +version = "0.5.0" +description = "Reusable constraint types to use with typing.Annotated" +optional = false +python-versions = ">=3.7" +files = [ + {file = "annotated_types-0.5.0-py3-none-any.whl", hash = "sha256:58da39888f92c276ad970249761ebea80ba544b77acddaa1a4d6cf78287d45fd"}, + {file = "annotated_types-0.5.0.tar.gz", hash = "sha256:47cdc3490d9ac1506ce92c7aaa76c579dc3509ff11e098fc867e5130ab7be802"}, +] + +[package.dependencies] +typing-extensions = {version = ">=4.0.0", markers = "python_version < \"3.9\""} + +[[package]] +name = "anyio" +version = "3.7.1" +description = "High level compatibility layer for multiple asynchronous event loop implementations" +optional = false +python-versions = ">=3.7" +files = [ + {file = "anyio-3.7.1-py3-none-any.whl", hash = "sha256:91dee416e570e92c64041bd18b900d1d6fa78dff7048769ce5ac5ddad004fbb5"}, + {file = "anyio-3.7.1.tar.gz", hash = "sha256:44a3c9aba0f5defa43261a8b3efb97891f2bd7d804e0e1f56419befa1adfc780"}, +] + +[package.dependencies] +exceptiongroup = {version = "*", markers = "python_version < \"3.11\""} +idna = ">=2.8" +sniffio = ">=1.1" +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} + +[package.extras] +doc = ["Sphinx", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphinx-rtd-theme (>=1.2.2)", "sphinxcontrib-jquery"] +test = ["anyio[trio]", "coverage[toml] (>=4.5)", "hypothesis (>=4.0)", "mock (>=4)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.17)"] +trio = ["trio (<0.22)"] + +[[package]] +name = "certifi" +version = "2023.11.17" +description = "Python package for providing Mozilla's CA Bundle." +optional = false +python-versions = ">=3.6" +files = [ + {file = "certifi-2023.11.17-py3-none-any.whl", hash = "sha256:e036ab49d5b79556f99cfc2d9320b34cfbe5be05c5871b51de9329f0603b0474"}, + {file = "certifi-2023.11.17.tar.gz", hash = "sha256:9b469f3a900bf28dc19b8cfbf8019bf47f7fdd1a65a1d4ffb98fc14166beb4d1"}, +] + +[[package]] +name = "colorama" +version = "0.4.6" +description = "Cross-platform colored terminal text." +optional = false +python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,!=3.6.*,>=2.7" +files = [ + {file = "colorama-0.4.6-py2.py3-none-any.whl", hash = "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"}, + {file = "colorama-0.4.6.tar.gz", hash = "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44"}, +] + +[[package]] +name = "exceptiongroup" +version = "1.2.0" +description = "Backport of PEP 654 (exception groups)" +optional = false +python-versions = ">=3.7" +files = [ + {file = "exceptiongroup-1.2.0-py3-none-any.whl", hash = "sha256:4bfd3996ac73b41e9b9628b04e079f193850720ea5945fc96a08633c66912f14"}, + {file = "exceptiongroup-1.2.0.tar.gz", hash = "sha256:91f5c769735f051a4290d52edd0858999b57e5876e9f85937691bd4c9fa3ed68"}, +] + +[package.extras] +test = ["pytest (>=6)"] + +[[package]] +name = "h11" +version = "0.14.0" +description = "A pure-Python, bring-your-own-I/O implementation of HTTP/1.1" +optional = false +python-versions = ">=3.7" +files = [ + {file = "h11-0.14.0-py3-none-any.whl", hash = "sha256:e3fe4ac4b851c468cc8363d500db52c2ead036020723024a109d37346efaa761"}, + {file = "h11-0.14.0.tar.gz", hash = "sha256:8f19fbbe99e72420ff35c00b27a34cb9937e902a8b810e2c88300c6f0a3b699d"}, +] + +[package.dependencies] +typing-extensions = {version = "*", markers = "python_version < \"3.8\""} + +[[package]] +name = "httpcore" +version = "0.17.3" +description = "A minimal low-level HTTP client." +optional = false +python-versions = ">=3.7" +files = [ + {file = "httpcore-0.17.3-py3-none-any.whl", hash = "sha256:c2789b767ddddfa2a5782e3199b2b7f6894540b17b16ec26b2c4d8e103510b87"}, + {file = "httpcore-0.17.3.tar.gz", hash = "sha256:a6f30213335e34c1ade7be6ec7c47f19f50c56db36abef1a9dfa3815b1cb3888"}, +] + +[package.dependencies] +anyio = ">=3.0,<5.0" +certifi = "*" +h11 = ">=0.13,<0.15" +sniffio = "==1.*" + +[package.extras] +http2 = ["h2 (>=3,<5)"] +socks = ["socksio (==1.*)"] + +[[package]] +name = "httpx" +version = "0.24.1" +description = "The next generation HTTP client." +optional = false +python-versions = ">=3.7" +files = [ + {file = "httpx-0.24.1-py3-none-any.whl", hash = "sha256:06781eb9ac53cde990577af654bd990a4949de37a28bdb4a230d434f3a30b9bd"}, + {file = "httpx-0.24.1.tar.gz", hash = "sha256:5853a43053df830c20f8110c5e69fe44d035d850b2dfe795e196f00fdb774bdd"}, +] + +[package.dependencies] +certifi = "*" +httpcore = ">=0.15.0,<0.18.0" +idna = "*" +sniffio = "*" + +[package.extras] +brotli = ["brotli", "brotlicffi"] +cli = ["click (==8.*)", "pygments (==2.*)", "rich (>=10,<14)"] +http2 = ["h2 (>=3,<5)"] +socks = ["socksio (==1.*)"] + +[[package]] +name = "idna" +version = "3.6" +description = "Internationalized Domain Names in Applications (IDNA)" +optional = false +python-versions = ">=3.5" +files = [ + {file = "idna-3.6-py3-none-any.whl", hash = "sha256:c05567e9c24a6b9faaa835c4821bad0590fbb9d5779e7caa6e1cc4978e7eb24f"}, + {file = "idna-3.6.tar.gz", hash = "sha256:9ecdbbd083b06798ae1e86adcbfe8ab1479cf864e4ee30fe4e46a003d12491ca"}, +] + +[[package]] +name = "importlib-metadata" +version = "6.7.0" +description = "Read metadata from Python packages" +optional = false +python-versions = ">=3.7" +files = [ + {file = "importlib_metadata-6.7.0-py3-none-any.whl", hash = "sha256:cb52082e659e97afc5dac71e79de97d8681de3aa07ff18578330904a9d18e5b5"}, + {file = "importlib_metadata-6.7.0.tar.gz", hash = "sha256:1aaf550d4f73e5d6783e7acb77aec43d49da8017410afae93822cc9cca98c4d4"}, +] + +[package.dependencies] +typing-extensions = {version = ">=3.6.4", markers = "python_version < \"3.8\""} +zipp = ">=0.5" + +[package.extras] +docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +perf = ["ipython"] +testing = ["flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)", "pytest-ruff"] + +[[package]] +name = "iniconfig" +version = "2.0.0" +description = "brain-dead simple config-ini parsing" +optional = false +python-versions = ">=3.7" +files = [ + {file = "iniconfig-2.0.0-py3-none-any.whl", hash = "sha256:b6a85871a79d2e3b22d2d1b94ac2824226a63c6b741c88f7ae975f18b6778374"}, + {file = "iniconfig-2.0.0.tar.gz", hash = "sha256:2d91e135bf72d31a410b17c16da610a82cb55f6b0477d1a902134b24a455b8b3"}, +] + +[[package]] +name = "mypy" +version = "0.971" +description = "Optional static typing for Python" +optional = false +python-versions = ">=3.6" +files = [ + {file = "mypy-0.971-cp310-cp310-macosx_10_9_universal2.whl", hash = "sha256:f2899a3cbd394da157194f913a931edfd4be5f274a88041c9dc2d9cdcb1c315c"}, + {file = "mypy-0.971-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:98e02d56ebe93981c41211c05adb630d1d26c14195d04d95e49cd97dbc046dc5"}, + {file = "mypy-0.971-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:19830b7dba7d5356d3e26e2427a2ec91c994cd92d983142cbd025ebe81d69cf3"}, + {file = "mypy-0.971-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:02ef476f6dcb86e6f502ae39a16b93285fef97e7f1ff22932b657d1ef1f28655"}, + {file = "mypy-0.971-cp310-cp310-win_amd64.whl", hash = "sha256:25c5750ba5609a0c7550b73a33deb314ecfb559c350bb050b655505e8aed4103"}, + {file = "mypy-0.971-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:d3348e7eb2eea2472db611486846742d5d52d1290576de99d59edeb7cd4a42ca"}, + {file = "mypy-0.971-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:3fa7a477b9900be9b7dd4bab30a12759e5abe9586574ceb944bc29cddf8f0417"}, + {file = "mypy-0.971-cp36-cp36m-win_amd64.whl", hash = "sha256:2ad53cf9c3adc43cf3bea0a7d01a2f2e86db9fe7596dfecb4496a5dda63cbb09"}, + {file = "mypy-0.971-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:855048b6feb6dfe09d3353466004490b1872887150c5bb5caad7838b57328cc8"}, + {file = "mypy-0.971-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:23488a14a83bca6e54402c2e6435467a4138785df93ec85aeff64c6170077fb0"}, + {file = "mypy-0.971-cp37-cp37m-win_amd64.whl", hash = "sha256:4b21e5b1a70dfb972490035128f305c39bc4bc253f34e96a4adf9127cf943eb2"}, + {file = "mypy-0.971-cp38-cp38-macosx_10_9_universal2.whl", hash = "sha256:9796a2ba7b4b538649caa5cecd398d873f4022ed2333ffde58eaf604c4d2cb27"}, + {file = "mypy-0.971-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:5a361d92635ad4ada1b1b2d3630fc2f53f2127d51cf2def9db83cba32e47c856"}, + {file = "mypy-0.971-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b793b899f7cf563b1e7044a5c97361196b938e92f0a4343a5d27966a53d2ec71"}, + {file = "mypy-0.971-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d1ea5d12c8e2d266b5fb8c7a5d2e9c0219fedfeb493b7ed60cd350322384ac27"}, + {file = "mypy-0.971-cp38-cp38-win_amd64.whl", hash = "sha256:23c7ff43fff4b0df93a186581885c8512bc50fc4d4910e0f838e35d6bb6b5e58"}, + {file = "mypy-0.971-cp39-cp39-macosx_10_9_universal2.whl", hash = "sha256:1f7656b69974a6933e987ee8ffb951d836272d6c0f81d727f1d0e2696074d9e6"}, + {file = "mypy-0.971-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:d2022bfadb7a5c2ef410d6a7c9763188afdb7f3533f22a0a32be10d571ee4bbe"}, + {file = "mypy-0.971-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:ef943c72a786b0f8d90fd76e9b39ce81fb7171172daf84bf43eaf937e9f220a9"}, + {file = "mypy-0.971-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d744f72eb39f69312bc6c2abf8ff6656973120e2eb3f3ec4f758ed47e414a4bf"}, + {file = "mypy-0.971-cp39-cp39-win_amd64.whl", hash = "sha256:77a514ea15d3007d33a9e2157b0ba9c267496acf12a7f2b9b9f8446337aac5b0"}, + {file = "mypy-0.971-py3-none-any.whl", hash = "sha256:0d054ef16b071149917085f51f89555a576e2618d5d9dd70bd6eea6410af3ac9"}, + {file = "mypy-0.971.tar.gz", hash = "sha256:40b0f21484238269ae6a57200c807d80debc6459d444c0489a102d7c6a75fa56"}, +] + +[package.dependencies] +mypy-extensions = ">=0.4.3" +tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""} +typed-ast = {version = ">=1.4.0,<2", markers = "python_version < \"3.8\""} +typing-extensions = ">=3.10" + +[package.extras] +dmypy = ["psutil (>=4.0)"] +python2 = ["typed-ast (>=1.4.0,<2)"] +reports = ["lxml"] + +[[package]] +name = "mypy-extensions" +version = "1.0.0" +description = "Type system extensions for programs checked with the mypy type checker." +optional = false +python-versions = ">=3.5" +files = [ + {file = "mypy_extensions-1.0.0-py3-none-any.whl", hash = "sha256:4392f6c0eb8a5668a69e23d168ffa70f0be9ccfd32b5cc2d26a34ae5b844552d"}, + {file = "mypy_extensions-1.0.0.tar.gz", hash = "sha256:75dbf8955dc00442a438fc4d0666508a9a97b6bd41aa2f0ffe9d2f2725af0782"}, +] + +[[package]] +name = "packaging" +version = "23.2" +description = "Core utilities for Python packages" +optional = false +python-versions = ">=3.7" +files = [ + {file = "packaging-23.2-py3-none-any.whl", hash = "sha256:8c491190033a9af7e1d931d0b5dacc2ef47509b34dd0de67ed209b5203fc88c7"}, + {file = "packaging-23.2.tar.gz", hash = "sha256:048fb0e9405036518eaaf48a55953c750c11e1a1b68e0dd1a9d62ed0c092cfc5"}, +] + +[[package]] +name = "pluggy" +version = "1.2.0" +description = "plugin and hook calling mechanisms for python" +optional = false +python-versions = ">=3.7" +files = [ + {file = "pluggy-1.2.0-py3-none-any.whl", hash = "sha256:c2fd55a7d7a3863cba1a013e4e2414658b1d07b6bc57b3919e0c63c9abb99849"}, + {file = "pluggy-1.2.0.tar.gz", hash = "sha256:d12f0c4b579b15f5e054301bb226ee85eeeba08ffec228092f8defbaa3a4c4b3"}, +] + +[package.dependencies] +importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} + +[package.extras] +dev = ["pre-commit", "tox"] +testing = ["pytest", "pytest-benchmark"] + +[[package]] +name = "pydantic" +version = "2.4.2" +description = "Data validation using Python type hints" +optional = false +python-versions = ">=3.7" +files = [ + {file = "pydantic-2.4.2-py3-none-any.whl", hash = "sha256:bc3ddf669d234f4220e6e1c4d96b061abe0998185a8d7855c0126782b7abc8c1"}, + {file = "pydantic-2.4.2.tar.gz", hash = "sha256:94f336138093a5d7f426aac732dcfe7ab4eb4da243c88f891d65deb4a2556ee7"}, +] + +[package.dependencies] +annotated-types = ">=0.4.0" +pydantic-core = "2.10.1" +typing-extensions = ">=4.6.1" + +[package.extras] +email = ["email-validator (>=2.0.0)"] + +[[package]] +name = "pydantic-core" +version = "2.10.1" +description = "" +optional = false +python-versions = ">=3.7" +files = [ + {file = "pydantic_core-2.10.1-cp310-cp310-macosx_10_7_x86_64.whl", hash = "sha256:d64728ee14e667ba27c66314b7d880b8eeb050e58ffc5fec3b7a109f8cddbd63"}, + {file = "pydantic_core-2.10.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:48525933fea744a3e7464c19bfede85df4aba79ce90c60b94d8b6e1eddd67096"}, + {file = "pydantic_core-2.10.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ef337945bbd76cce390d1b2496ccf9f90b1c1242a3a7bc242ca4a9fc5993427a"}, + {file = "pydantic_core-2.10.1-cp310-cp310-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:a1392e0638af203cee360495fd2cfdd6054711f2db5175b6e9c3c461b76f5175"}, + {file = "pydantic_core-2.10.1-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0675ba5d22de54d07bccde38997e780044dcfa9a71aac9fd7d4d7a1d2e3e65f7"}, + {file = "pydantic_core-2.10.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:128552af70a64660f21cb0eb4876cbdadf1a1f9d5de820fed6421fa8de07c893"}, + {file = "pydantic_core-2.10.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8f6e6aed5818c264412ac0598b581a002a9f050cb2637a84979859e70197aa9e"}, + {file = "pydantic_core-2.10.1-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:ecaac27da855b8d73f92123e5f03612b04c5632fd0a476e469dfc47cd37d6b2e"}, + {file = "pydantic_core-2.10.1-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:b3c01c2fb081fced3bbb3da78510693dc7121bb893a1f0f5f4b48013201f362e"}, + {file = "pydantic_core-2.10.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:92f675fefa977625105708492850bcbc1182bfc3e997f8eecb866d1927c98ae6"}, + {file = "pydantic_core-2.10.1-cp310-none-win32.whl", hash = "sha256:420a692b547736a8d8703c39ea935ab5d8f0d2573f8f123b0a294e49a73f214b"}, + {file = "pydantic_core-2.10.1-cp310-none-win_amd64.whl", hash = "sha256:0880e239827b4b5b3e2ce05e6b766a7414e5f5aedc4523be6b68cfbc7f61c5d0"}, + {file = "pydantic_core-2.10.1-cp311-cp311-macosx_10_7_x86_64.whl", hash = "sha256:073d4a470b195d2b2245d0343569aac7e979d3a0dcce6c7d2af6d8a920ad0bea"}, + {file = "pydantic_core-2.10.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:600d04a7b342363058b9190d4e929a8e2e715c5682a70cc37d5ded1e0dd370b4"}, + {file = "pydantic_core-2.10.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:39215d809470f4c8d1881758575b2abfb80174a9e8daf8f33b1d4379357e417c"}, + {file = "pydantic_core-2.10.1-cp311-cp311-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:eeb3d3d6b399ffe55f9a04e09e635554012f1980696d6b0aca3e6cf42a17a03b"}, + {file = "pydantic_core-2.10.1-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:a7a7902bf75779bc12ccfc508bfb7a4c47063f748ea3de87135d433a4cca7a2f"}, + {file = "pydantic_core-2.10.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:3625578b6010c65964d177626fde80cf60d7f2e297d56b925cb5cdeda6e9925a"}, + {file = "pydantic_core-2.10.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:caa48fc31fc7243e50188197b5f0c4228956f97b954f76da157aae7f67269ae8"}, + {file = "pydantic_core-2.10.1-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:07ec6d7d929ae9c68f716195ce15e745b3e8fa122fc67698ac6498d802ed0fa4"}, + {file = "pydantic_core-2.10.1-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:e6f31a17acede6a8cd1ae2d123ce04d8cca74056c9d456075f4f6f85de055607"}, + {file = "pydantic_core-2.10.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d8f1ebca515a03e5654f88411420fea6380fc841d1bea08effb28184e3d4899f"}, + {file = "pydantic_core-2.10.1-cp311-none-win32.whl", hash = "sha256:6db2eb9654a85ada248afa5a6db5ff1cf0f7b16043a6b070adc4a5be68c716d6"}, + {file = "pydantic_core-2.10.1-cp311-none-win_amd64.whl", hash = "sha256:4a5be350f922430997f240d25f8219f93b0c81e15f7b30b868b2fddfc2d05f27"}, + {file = "pydantic_core-2.10.1-cp311-none-win_arm64.whl", hash = "sha256:5fdb39f67c779b183b0c853cd6b45f7db84b84e0571b3ef1c89cdb1dfc367325"}, + {file = "pydantic_core-2.10.1-cp312-cp312-macosx_10_7_x86_64.whl", hash = "sha256:b1f22a9ab44de5f082216270552aa54259db20189e68fc12484873d926426921"}, + {file = "pydantic_core-2.10.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:8572cadbf4cfa95fb4187775b5ade2eaa93511f07947b38f4cd67cf10783b118"}, + {file = "pydantic_core-2.10.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:db9a28c063c7c00844ae42a80203eb6d2d6bbb97070cfa00194dff40e6f545ab"}, + {file = "pydantic_core-2.10.1-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:0e2a35baa428181cb2270a15864ec6286822d3576f2ed0f4cd7f0c1708472aff"}, + {file = "pydantic_core-2.10.1-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:05560ab976012bf40f25d5225a58bfa649bb897b87192a36c6fef1ab132540d7"}, + {file = "pydantic_core-2.10.1-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:d6495008733c7521a89422d7a68efa0a0122c99a5861f06020ef5b1f51f9ba7c"}, + {file = "pydantic_core-2.10.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:14ac492c686defc8e6133e3a2d9eaf5261b3df26b8ae97450c1647286750b901"}, + {file = "pydantic_core-2.10.1-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:8282bab177a9a3081fd3d0a0175a07a1e2bfb7fcbbd949519ea0980f8a07144d"}, + {file = "pydantic_core-2.10.1-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:aafdb89fdeb5fe165043896817eccd6434aee124d5ee9b354f92cd574ba5e78f"}, + {file = "pydantic_core-2.10.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:f6defd966ca3b187ec6c366604e9296f585021d922e666b99c47e78738b5666c"}, + {file = "pydantic_core-2.10.1-cp312-none-win32.whl", hash = "sha256:7c4d1894fe112b0864c1fa75dffa045720a194b227bed12f4be7f6045b25209f"}, + {file = "pydantic_core-2.10.1-cp312-none-win_amd64.whl", hash = "sha256:5994985da903d0b8a08e4935c46ed8daf5be1cf217489e673910951dc533d430"}, + {file = "pydantic_core-2.10.1-cp312-none-win_arm64.whl", hash = "sha256:0d8a8adef23d86d8eceed3e32e9cca8879c7481c183f84ed1a8edc7df073af94"}, + {file = "pydantic_core-2.10.1-cp37-cp37m-macosx_10_7_x86_64.whl", hash = "sha256:9badf8d45171d92387410b04639d73811b785b5161ecadabf056ea14d62d4ede"}, + {file = "pydantic_core-2.10.1-cp37-cp37m-macosx_11_0_arm64.whl", hash = "sha256:ebedb45b9feb7258fac0a268a3f6bec0a2ea4d9558f3d6f813f02ff3a6dc6698"}, + {file = "pydantic_core-2.10.1-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cfe1090245c078720d250d19cb05d67e21a9cd7c257698ef139bc41cf6c27b4f"}, + {file = "pydantic_core-2.10.1-cp37-cp37m-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e357571bb0efd65fd55f18db0a2fb0ed89d0bb1d41d906b138f088933ae618bb"}, + {file = "pydantic_core-2.10.1-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b3dcd587b69bbf54fc04ca157c2323b8911033e827fffaecf0cafa5a892a0904"}, + {file = "pydantic_core-2.10.1-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9c120c9ce3b163b985a3b966bb701114beb1da4b0468b9b236fc754783d85aa3"}, + {file = "pydantic_core-2.10.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:15d6bca84ffc966cc9976b09a18cf9543ed4d4ecbd97e7086f9ce9327ea48891"}, + {file = "pydantic_core-2.10.1-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5cabb9710f09d5d2e9e2748c3e3e20d991a4c5f96ed8f1132518f54ab2967221"}, + {file = "pydantic_core-2.10.1-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:82f55187a5bebae7d81d35b1e9aaea5e169d44819789837cdd4720d768c55d15"}, + {file = "pydantic_core-2.10.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:1d40f55222b233e98e3921df7811c27567f0e1a4411b93d4c5c0f4ce131bc42f"}, + {file = "pydantic_core-2.10.1-cp37-none-win32.whl", hash = "sha256:14e09ff0b8fe6e46b93d36a878f6e4a3a98ba5303c76bb8e716f4878a3bee92c"}, + {file = "pydantic_core-2.10.1-cp37-none-win_amd64.whl", hash = "sha256:1396e81b83516b9d5c9e26a924fa69164156c148c717131f54f586485ac3c15e"}, + {file = "pydantic_core-2.10.1-cp38-cp38-macosx_10_7_x86_64.whl", hash = "sha256:6835451b57c1b467b95ffb03a38bb75b52fb4dc2762bb1d9dbed8de31ea7d0fc"}, + {file = "pydantic_core-2.10.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:b00bc4619f60c853556b35f83731bd817f989cba3e97dc792bb8c97941b8053a"}, + {file = "pydantic_core-2.10.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0fa467fd300a6f046bdb248d40cd015b21b7576c168a6bb20aa22e595c8ffcdd"}, + {file = "pydantic_core-2.10.1-cp38-cp38-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:d99277877daf2efe074eae6338453a4ed54a2d93fb4678ddfe1209a0c93a2468"}, + {file = "pydantic_core-2.10.1-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:fa7db7558607afeccb33c0e4bf1c9a9a835e26599e76af6fe2fcea45904083a6"}, + {file = "pydantic_core-2.10.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:aad7bd686363d1ce4ee930ad39f14e1673248373f4a9d74d2b9554f06199fb58"}, + {file = "pydantic_core-2.10.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:443fed67d33aa85357464f297e3d26e570267d1af6fef1c21ca50921d2976302"}, + {file = "pydantic_core-2.10.1-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:042462d8d6ba707fd3ce9649e7bf268633a41018d6a998fb5fbacb7e928a183e"}, + {file = "pydantic_core-2.10.1-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:ecdbde46235f3d560b18be0cb706c8e8ad1b965e5c13bbba7450c86064e96561"}, + {file = "pydantic_core-2.10.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:ed550ed05540c03f0e69e6d74ad58d026de61b9eaebebbaaf8873e585cbb18de"}, + {file = "pydantic_core-2.10.1-cp38-none-win32.whl", hash = "sha256:8cdbbd92154db2fec4ec973d45c565e767ddc20aa6dbaf50142676484cbff8ee"}, + {file = "pydantic_core-2.10.1-cp38-none-win_amd64.whl", hash = "sha256:9f6f3e2598604956480f6c8aa24a3384dbf6509fe995d97f6ca6103bb8c2534e"}, + {file = "pydantic_core-2.10.1-cp39-cp39-macosx_10_7_x86_64.whl", hash = "sha256:655f8f4c8d6a5963c9a0687793da37b9b681d9ad06f29438a3b2326d4e6b7970"}, + {file = "pydantic_core-2.10.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e570ffeb2170e116a5b17e83f19911020ac79d19c96f320cbfa1fa96b470185b"}, + {file = "pydantic_core-2.10.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:64322bfa13e44c6c30c518729ef08fda6026b96d5c0be724b3c4ae4da939f875"}, + {file = "pydantic_core-2.10.1-cp39-cp39-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:485a91abe3a07c3a8d1e082ba29254eea3e2bb13cbbd4351ea4e5a21912cc9b0"}, + {file = "pydantic_core-2.10.1-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:f7c2b8eb9fc872e68b46eeaf835e86bccc3a58ba57d0eedc109cbb14177be531"}, + {file = "pydantic_core-2.10.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a5cb87bdc2e5f620693148b5f8f842d293cae46c5f15a1b1bf7ceeed324a740c"}, + {file = "pydantic_core-2.10.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:25bd966103890ccfa028841a8f30cebcf5875eeac8c4bde4fe221364c92f0c9a"}, + {file = "pydantic_core-2.10.1-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f323306d0556351735b54acbf82904fe30a27b6a7147153cbe6e19aaaa2aa429"}, + {file = "pydantic_core-2.10.1-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:0c27f38dc4fbf07b358b2bc90edf35e82d1703e22ff2efa4af4ad5de1b3833e7"}, + {file = "pydantic_core-2.10.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:f1365e032a477c1430cfe0cf2856679529a2331426f8081172c4a74186f1d595"}, + {file = "pydantic_core-2.10.1-cp39-none-win32.whl", hash = "sha256:a1c311fd06ab3b10805abb72109f01a134019739bd3286b8ae1bc2fc4e50c07a"}, + {file = "pydantic_core-2.10.1-cp39-none-win_amd64.whl", hash = "sha256:ae8a8843b11dc0b03b57b52793e391f0122e740de3df1474814c700d2622950a"}, + {file = "pydantic_core-2.10.1-pp310-pypy310_pp73-macosx_10_7_x86_64.whl", hash = "sha256:d43002441932f9a9ea5d6f9efaa2e21458221a3a4b417a14027a1d530201ef1b"}, + {file = "pydantic_core-2.10.1-pp310-pypy310_pp73-macosx_11_0_arm64.whl", hash = "sha256:fcb83175cc4936a5425dde3356f079ae03c0802bbdf8ff82c035f8a54b333521"}, + {file = "pydantic_core-2.10.1-pp310-pypy310_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:962ed72424bf1f72334e2f1e61b68f16c0e596f024ca7ac5daf229f7c26e4208"}, + {file = "pydantic_core-2.10.1-pp310-pypy310_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:2cf5bb4dd67f20f3bbc1209ef572a259027c49e5ff694fa56bed62959b41e1f9"}, + {file = "pydantic_core-2.10.1-pp310-pypy310_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:e544246b859f17373bed915182ab841b80849ed9cf23f1f07b73b7c58baee5fb"}, + {file = "pydantic_core-2.10.1-pp310-pypy310_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:c0877239307b7e69d025b73774e88e86ce82f6ba6adf98f41069d5b0b78bd1bf"}, + {file = "pydantic_core-2.10.1-pp310-pypy310_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:53df009d1e1ba40f696f8995683e067e3967101d4bb4ea6f667931b7d4a01357"}, + {file = "pydantic_core-2.10.1-pp310-pypy310_pp73-win_amd64.whl", hash = "sha256:a1254357f7e4c82e77c348dabf2d55f1d14d19d91ff025004775e70a6ef40ada"}, + {file = "pydantic_core-2.10.1-pp37-pypy37_pp73-macosx_10_7_x86_64.whl", hash = "sha256:524ff0ca3baea164d6d93a32c58ac79eca9f6cf713586fdc0adb66a8cdeab96a"}, + {file = "pydantic_core-2.10.1-pp37-pypy37_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:3f0ac9fb8608dbc6eaf17956bf623c9119b4db7dbb511650910a82e261e6600f"}, + {file = "pydantic_core-2.10.1-pp37-pypy37_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:320f14bd4542a04ab23747ff2c8a778bde727158b606e2661349557f0770711e"}, + {file = "pydantic_core-2.10.1-pp37-pypy37_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:63974d168b6233b4ed6a0046296803cb13c56637a7b8106564ab575926572a55"}, + {file = "pydantic_core-2.10.1-pp37-pypy37_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:417243bf599ba1f1fef2bb8c543ceb918676954734e2dcb82bf162ae9d7bd514"}, + {file = "pydantic_core-2.10.1-pp37-pypy37_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:dda81e5ec82485155a19d9624cfcca9be88a405e2857354e5b089c2a982144b2"}, + {file = "pydantic_core-2.10.1-pp37-pypy37_pp73-win_amd64.whl", hash = "sha256:14cfbb00959259e15d684505263d5a21732b31248a5dd4941f73a3be233865b9"}, + {file = "pydantic_core-2.10.1-pp38-pypy38_pp73-macosx_10_7_x86_64.whl", hash = "sha256:631cb7415225954fdcc2a024119101946793e5923f6c4d73a5914d27eb3d3a05"}, + {file = "pydantic_core-2.10.1-pp38-pypy38_pp73-macosx_11_0_arm64.whl", hash = "sha256:bec7dd208a4182e99c5b6c501ce0b1f49de2802448d4056091f8e630b28e9a52"}, + {file = "pydantic_core-2.10.1-pp38-pypy38_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:149b8a07712f45b332faee1a2258d8ef1fb4a36f88c0c17cb687f205c5dc6e7d"}, + {file = "pydantic_core-2.10.1-pp38-pypy38_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:4d966c47f9dd73c2d32a809d2be529112d509321c5310ebf54076812e6ecd884"}, + {file = "pydantic_core-2.10.1-pp38-pypy38_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:7eb037106f5c6b3b0b864ad226b0b7ab58157124161d48e4b30c4a43fef8bc4b"}, + {file = "pydantic_core-2.10.1-pp38-pypy38_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:154ea7c52e32dce13065dbb20a4a6f0cc012b4f667ac90d648d36b12007fa9f7"}, + {file = "pydantic_core-2.10.1-pp38-pypy38_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:e562617a45b5a9da5be4abe72b971d4f00bf8555eb29bb91ec2ef2be348cd132"}, + {file = "pydantic_core-2.10.1-pp38-pypy38_pp73-win_amd64.whl", hash = "sha256:f23b55eb5464468f9e0e9a9935ce3ed2a870608d5f534025cd5536bca25b1402"}, + {file = "pydantic_core-2.10.1-pp39-pypy39_pp73-macosx_10_7_x86_64.whl", hash = "sha256:e9121b4009339b0f751955baf4543a0bfd6bc3f8188f8056b1a25a2d45099934"}, + {file = "pydantic_core-2.10.1-pp39-pypy39_pp73-macosx_11_0_arm64.whl", hash = "sha256:0523aeb76e03f753b58be33b26540880bac5aa54422e4462404c432230543f33"}, + {file = "pydantic_core-2.10.1-pp39-pypy39_pp73-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:2e0e2959ef5d5b8dc9ef21e1a305a21a36e254e6a34432d00c72a92fdc5ecda5"}, + {file = "pydantic_core-2.10.1-pp39-pypy39_pp73-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:da01bec0a26befab4898ed83b362993c844b9a607a86add78604186297eb047e"}, + {file = "pydantic_core-2.10.1-pp39-pypy39_pp73-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:f2e9072d71c1f6cfc79a36d4484c82823c560e6f5599c43c1ca6b5cdbd54f881"}, + {file = "pydantic_core-2.10.1-pp39-pypy39_pp73-musllinux_1_1_aarch64.whl", hash = "sha256:f36a3489d9e28fe4b67be9992a23029c3cec0babc3bd9afb39f49844a8c721c5"}, + {file = "pydantic_core-2.10.1-pp39-pypy39_pp73-musllinux_1_1_x86_64.whl", hash = "sha256:f64f82cc3443149292b32387086d02a6c7fb39b8781563e0ca7b8d7d9cf72bd7"}, + {file = "pydantic_core-2.10.1-pp39-pypy39_pp73-win_amd64.whl", hash = "sha256:b4a6db486ac8e99ae696e09efc8b2b9fea67b63c8f88ba7a1a16c24a057a0776"}, + {file = "pydantic_core-2.10.1.tar.gz", hash = "sha256:0f8682dbdd2f67f8e1edddcbffcc29f60a6182b4901c367fc8c1c40d30bb0a82"}, +] + +[package.dependencies] +typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0" + +[[package]] +name = "pytest" +version = "7.4.3" +description = "pytest: simple powerful testing with Python" +optional = false +python-versions = ">=3.7" +files = [ + {file = "pytest-7.4.3-py3-none-any.whl", hash = "sha256:0d009c083ea859a71b76adf7c1d502e4bc170b80a8ef002da5806527b9591fac"}, + {file = "pytest-7.4.3.tar.gz", hash = "sha256:d989d136982de4e3b29dabcc838ad581c64e8ed52c11fbe86ddebd9da0818cd5"}, +] + +[package.dependencies] +colorama = {version = "*", markers = "sys_platform == \"win32\""} +exceptiongroup = {version = ">=1.0.0rc8", markers = "python_version < \"3.11\""} +importlib-metadata = {version = ">=0.12", markers = "python_version < \"3.8\""} +iniconfig = "*" +packaging = "*" +pluggy = ">=0.12,<2.0" +tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} + +[package.extras] +testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] + +[[package]] +name = "sniffio" +version = "1.3.0" +description = "Sniff out which async library your code is running under" +optional = false +python-versions = ">=3.7" +files = [ + {file = "sniffio-1.3.0-py3-none-any.whl", hash = "sha256:eecefdce1e5bbfb7ad2eeaabf7c1eeb404d7757c379bd1f7e5cce9d8bf425384"}, + {file = "sniffio-1.3.0.tar.gz", hash = "sha256:e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101"}, +] + +[[package]] +name = "tomli" +version = "2.0.1" +description = "A lil' TOML parser" +optional = false +python-versions = ">=3.7" +files = [ + {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"}, + {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, +] + +[[package]] +name = "typed-ast" +version = "1.5.5" +description = "a fork of Python 2 and 3 ast modules with type comment support" +optional = false +python-versions = ">=3.6" +files = [ + {file = "typed_ast-1.5.5-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:4bc1efe0ce3ffb74784e06460f01a223ac1f6ab31c6bc0376a21184bf5aabe3b"}, + {file = "typed_ast-1.5.5-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:5f7a8c46a8b333f71abd61d7ab9255440d4a588f34a21f126bbfc95f6049e686"}, + {file = "typed_ast-1.5.5-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:597fc66b4162f959ee6a96b978c0435bd63791e31e4f410622d19f1686d5e769"}, + {file = "typed_ast-1.5.5-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d41b7a686ce653e06c2609075d397ebd5b969d821b9797d029fccd71fdec8e04"}, + {file = "typed_ast-1.5.5-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:5fe83a9a44c4ce67c796a1b466c270c1272e176603d5e06f6afbc101a572859d"}, + {file = "typed_ast-1.5.5-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:d5c0c112a74c0e5db2c75882a0adf3133adedcdbfd8cf7c9d6ed77365ab90a1d"}, + {file = "typed_ast-1.5.5-cp310-cp310-win_amd64.whl", hash = "sha256:e1a976ed4cc2d71bb073e1b2a250892a6e968ff02aa14c1f40eba4f365ffec02"}, + {file = "typed_ast-1.5.5-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:c631da9710271cb67b08bd3f3813b7af7f4c69c319b75475436fcab8c3d21bee"}, + {file = "typed_ast-1.5.5-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:b445c2abfecab89a932b20bd8261488d574591173d07827c1eda32c457358b18"}, + {file = "typed_ast-1.5.5-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cc95ffaaab2be3b25eb938779e43f513e0e538a84dd14a5d844b8f2932593d88"}, + {file = "typed_ast-1.5.5-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:61443214d9b4c660dcf4b5307f15c12cb30bdfe9588ce6158f4a005baeb167b2"}, + {file = "typed_ast-1.5.5-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:6eb936d107e4d474940469e8ec5b380c9b329b5f08b78282d46baeebd3692dc9"}, + {file = "typed_ast-1.5.5-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e48bf27022897577d8479eaed64701ecaf0467182448bd95759883300ca818c8"}, + {file = "typed_ast-1.5.5-cp311-cp311-win_amd64.whl", hash = "sha256:83509f9324011c9a39faaef0922c6f720f9623afe3fe220b6d0b15638247206b"}, + {file = "typed_ast-1.5.5-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:44f214394fc1af23ca6d4e9e744804d890045d1643dd7e8229951e0ef39429b5"}, + {file = "typed_ast-1.5.5-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:118c1ce46ce58fda78503eae14b7664163aa735b620b64b5b725453696f2a35c"}, + {file = "typed_ast-1.5.5-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:be4919b808efa61101456e87f2d4c75b228f4e52618621c77f1ddcaae15904fa"}, + {file = "typed_ast-1.5.5-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:fc2b8c4e1bc5cd96c1a823a885e6b158f8451cf6f5530e1829390b4d27d0807f"}, + {file = "typed_ast-1.5.5-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:16f7313e0a08c7de57f2998c85e2a69a642e97cb32f87eb65fbfe88381a5e44d"}, + {file = "typed_ast-1.5.5-cp36-cp36m-win_amd64.whl", hash = "sha256:2b946ef8c04f77230489f75b4b5a4a6f24c078be4aed241cfabe9cbf4156e7e5"}, + {file = "typed_ast-1.5.5-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:2188bc33d85951ea4ddad55d2b35598b2709d122c11c75cffd529fbc9965508e"}, + {file = "typed_ast-1.5.5-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0635900d16ae133cab3b26c607586131269f88266954eb04ec31535c9a12ef1e"}, + {file = "typed_ast-1.5.5-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:57bfc3cf35a0f2fdf0a88a3044aafaec1d2f24d8ae8cd87c4f58d615fb5b6311"}, + {file = "typed_ast-1.5.5-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:fe58ef6a764de7b4b36edfc8592641f56e69b7163bba9f9c8089838ee596bfb2"}, + {file = "typed_ast-1.5.5-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:d09d930c2d1d621f717bb217bf1fe2584616febb5138d9b3e8cdd26506c3f6d4"}, + {file = "typed_ast-1.5.5-cp37-cp37m-win_amd64.whl", hash = "sha256:d40c10326893ecab8a80a53039164a224984339b2c32a6baf55ecbd5b1df6431"}, + {file = "typed_ast-1.5.5-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:fd946abf3c31fb50eee07451a6aedbfff912fcd13cf357363f5b4e834cc5e71a"}, + {file = "typed_ast-1.5.5-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:ed4a1a42df8a3dfb6b40c3d2de109e935949f2f66b19703eafade03173f8f437"}, + {file = "typed_ast-1.5.5-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:045f9930a1550d9352464e5149710d56a2aed23a2ffe78946478f7b5416f1ede"}, + {file = "typed_ast-1.5.5-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:381eed9c95484ceef5ced626355fdc0765ab51d8553fec08661dce654a935db4"}, + {file = "typed_ast-1.5.5-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:bfd39a41c0ef6f31684daff53befddae608f9daf6957140228a08e51f312d7e6"}, + {file = "typed_ast-1.5.5-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8c524eb3024edcc04e288db9541fe1f438f82d281e591c548903d5b77ad1ddd4"}, + {file = "typed_ast-1.5.5-cp38-cp38-win_amd64.whl", hash = "sha256:7f58fabdde8dcbe764cef5e1a7fcb440f2463c1bbbec1cf2a86ca7bc1f95184b"}, + {file = "typed_ast-1.5.5-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:042eb665ff6bf020dd2243307d11ed626306b82812aba21836096d229fdc6a10"}, + {file = "typed_ast-1.5.5-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:622e4a006472b05cf6ef7f9f2636edc51bda670b7bbffa18d26b255269d3d814"}, + {file = "typed_ast-1.5.5-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1efebbbf4604ad1283e963e8915daa240cb4bf5067053cf2f0baadc4d4fb51b8"}, + {file = "typed_ast-1.5.5-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f0aefdd66f1784c58f65b502b6cf8b121544680456d1cebbd300c2c813899274"}, + {file = "typed_ast-1.5.5-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:48074261a842acf825af1968cd912f6f21357316080ebaca5f19abbb11690c8a"}, + {file = "typed_ast-1.5.5-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:429ae404f69dc94b9361bb62291885894b7c6fb4640d561179548c849f8492ba"}, + {file = "typed_ast-1.5.5-cp39-cp39-win_amd64.whl", hash = "sha256:335f22ccb244da2b5c296e6f96b06ee9bed46526db0de38d2f0e5a6597b81155"}, + {file = "typed_ast-1.5.5.tar.gz", hash = "sha256:94282f7a354f36ef5dbce0ef3467ebf6a258e370ab33d5b40c249fa996e590dd"}, +] + +[[package]] +name = "typing-extensions" +version = "4.7.1" +description = "Backported and Experimental Type Hints for Python 3.7+" +optional = false +python-versions = ">=3.7" +files = [ + {file = "typing_extensions-4.7.1-py3-none-any.whl", hash = "sha256:440d5dd3af93b060174bf433bccd69b0babc3b15b1a8dca43789fd7f61514b36"}, + {file = "typing_extensions-4.7.1.tar.gz", hash = "sha256:b75ddc264f0ba5615db7ba217daeb99701ad295353c45f9e95963337ceeeffb2"}, +] + +[[package]] +name = "zipp" +version = "3.15.0" +description = "Backport of pathlib-compatible object wrapper for zip files" +optional = false +python-versions = ">=3.7" +files = [ + {file = "zipp-3.15.0-py3-none-any.whl", hash = "sha256:48904fc76a60e542af151aded95726c1a5c34ed43ab4134b597665c86d7ad556"}, + {file = "zipp-3.15.0.tar.gz", hash = "sha256:112929ad649da941c23de50f356a2b5570c954b65150642bccdd66bf194d224b"}, +] + +[package.extras] +docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)", "sphinx-lint"] +testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more-itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] + +[metadata] +lock-version = "2.0" +python-versions = "^3.7" +content-hash = "4ac84aae6b05a415337279868d39fe7ce44104dffcd6b159af9e12dcea350ba1" diff --git a/seed/sdk/optional/pyproject.toml b/seed/sdk/optional/pyproject.toml new file mode 100644 index 000000000..71edfe05a --- /dev/null +++ b/seed/sdk/optional/pyproject.toml @@ -0,0 +1,22 @@ +[tool.poetry] +name = "seed" +version = "0.0.0" +description = "" +readme = "README.md" +authors = [] +packages = [ + { include = "seed", from = "src"} +] + +[tool.poetry.dependencies] +python = "^3.7" +httpx = ">=0.21.2" +pydantic = ">= 1.9.2, < 2.5.0" + +[tool.poetry.dev-dependencies] +mypy = "0.971" +pytest = "^7.4.0" + +[build-system] +requires = ["poetry-core"] +build-backend = "poetry.core.masonry.api" diff --git a/seed/sdk/optional/snippet.json b/seed/sdk/optional/snippet.json new file mode 100644 index 000000000..e69de29bb diff --git a/seed/sdk/audiences/src/seed/resources/folder_b/resources/common/__init__.py b/seed/sdk/optional/src/seed/__init__.py similarity index 58% rename from seed/sdk/audiences/src/seed/resources/folder_b/resources/common/__init__.py rename to seed/sdk/optional/src/seed/__init__.py index a06e03f9d..5d922b025 100644 --- a/seed/sdk/audiences/src/seed/resources/folder_b/resources/common/__init__.py +++ b/seed/sdk/optional/src/seed/__init__.py @@ -1,5 +1,5 @@ # This file was auto-generated by Fern from our API Definition. -from .types import Foo +from . import optional -__all__ = ["Foo"] +__all__ = ["optional"] diff --git a/seed/sdk/optional/src/seed/client.py b/seed/sdk/optional/src/seed/client.py new file mode 100644 index 000000000..25774a6a4 --- /dev/null +++ b/seed/sdk/optional/src/seed/client.py @@ -0,0 +1,32 @@ +# This file was auto-generated by Fern from our API Definition. + +import typing + +import httpx + +from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .optional._client import AsyncOptionalClient, OptionalClient + + +class SeedObjectsWithImports: + def __init__( + self, *, base_url: str, timeout: typing.Optional[float] = 60, httpx_client: typing.Optional[httpx.Client] = None + ): + self._client_wrapper = SyncClientWrapper( + base_url=base_url, httpx_client=httpx.Client(timeout=timeout) if httpx_client is None else httpx_client + ) + self.optional = OptionalClient(client_wrapper=self._client_wrapper) + + +class AsyncSeedObjectsWithImports: + def __init__( + self, + *, + base_url: str, + timeout: typing.Optional[float] = 60, + httpx_client: typing.Optional[httpx.AsyncClient] = None + ): + self._client_wrapper = AsyncClientWrapper( + base_url=base_url, httpx_client=httpx.AsyncClient(timeout=timeout) if httpx_client is None else httpx_client + ) + self.optional = AsyncOptionalClient(client_wrapper=self._client_wrapper) diff --git a/seed/sdk/optional/src/seed/core/__init__.py b/seed/sdk/optional/src/seed/core/__init__.py new file mode 100644 index 000000000..24149550b --- /dev/null +++ b/seed/sdk/optional/src/seed/core/__init__.py @@ -0,0 +1,17 @@ +# This file was auto-generated by Fern from our API Definition. + +from .api_error import ApiError +from .client_wrapper import AsyncClientWrapper, BaseClientWrapper, SyncClientWrapper +from .datetime_utils import serialize_datetime +from .jsonable_encoder import jsonable_encoder +from .remove_none_from_dict import remove_none_from_dict + +__all__ = [ + "ApiError", + "AsyncClientWrapper", + "BaseClientWrapper", + "SyncClientWrapper", + "jsonable_encoder", + "remove_none_from_dict", + "serialize_datetime", +] diff --git a/seed/sdk/optional/src/seed/core/api_error.py b/seed/sdk/optional/src/seed/core/api_error.py new file mode 100644 index 000000000..2e9fc5431 --- /dev/null +++ b/seed/sdk/optional/src/seed/core/api_error.py @@ -0,0 +1,15 @@ +# This file was auto-generated by Fern from our API Definition. + +import typing + + +class ApiError(Exception): + status_code: typing.Optional[int] + body: typing.Any + + def __init__(self, *, status_code: typing.Optional[int] = None, body: typing.Any = None): + self.status_code = status_code + self.body = body + + def __str__(self) -> str: + return f"status_code: {self.status_code}, body: {self.body}" diff --git a/seed/sdk/optional/src/seed/core/client_wrapper.py b/seed/sdk/optional/src/seed/core/client_wrapper.py new file mode 100644 index 000000000..553afa9a0 --- /dev/null +++ b/seed/sdk/optional/src/seed/core/client_wrapper.py @@ -0,0 +1,33 @@ +# This file was auto-generated by Fern from our API Definition. + +import typing + +import httpx + + +class BaseClientWrapper: + def __init__(self, *, base_url: str): + self._base_url = base_url + + def get_headers(self) -> typing.Dict[str, str]: + headers: typing.Dict[str, str] = { + "X-Fern-Language": "Python", + "X-Fern-SDK-Name": "seed", + "X-Fern-SDK-Version": "0.0.0", + } + return headers + + def get_base_url(self) -> str: + return self._base_url + + +class SyncClientWrapper(BaseClientWrapper): + def __init__(self, *, base_url: str, httpx_client: httpx.Client): + super().__init__(base_url=base_url) + self.httpx_client = httpx_client + + +class AsyncClientWrapper(BaseClientWrapper): + def __init__(self, *, base_url: str, httpx_client: httpx.AsyncClient): + super().__init__(base_url=base_url) + self.httpx_client = httpx_client diff --git a/seed/sdk/optional/src/seed/core/datetime_utils.py b/seed/sdk/optional/src/seed/core/datetime_utils.py new file mode 100644 index 000000000..7c9864a94 --- /dev/null +++ b/seed/sdk/optional/src/seed/core/datetime_utils.py @@ -0,0 +1,28 @@ +# This file was auto-generated by Fern from our API Definition. + +import datetime as dt + + +def serialize_datetime(v: dt.datetime) -> str: + """ + Serialize a datetime including timezone info. + + Uses the timezone info provided if present, otherwise uses the current runtime's timezone info. + + UTC datetimes end in "Z" while all other timezones are represented as offset from UTC, e.g. +05:00. + """ + + def _serialize_zoned_datetime(v: dt.datetime) -> str: + if v.tzinfo is not None and v.tzinfo.tzname(None) == dt.timezone.utc.tzname(None): + # UTC is a special case where we use "Z" at the end instead of "+00:00" + return v.isoformat().replace("+00:00", "Z") + else: + # Delegate to the typical +/- offset format + return v.isoformat() + + if v.tzinfo is not None: + return _serialize_zoned_datetime(v) + else: + local_tz = dt.datetime.now().astimezone().tzinfo + localized_dt = v.replace(tzinfo=local_tz) + return _serialize_zoned_datetime(localized_dt) diff --git a/seed/sdk/optional/src/seed/core/jsonable_encoder.py b/seed/sdk/optional/src/seed/core/jsonable_encoder.py new file mode 100644 index 000000000..37238ab67 --- /dev/null +++ b/seed/sdk/optional/src/seed/core/jsonable_encoder.py @@ -0,0 +1,103 @@ +# This file was auto-generated by Fern from our API Definition. + +""" +jsonable_encoder converts a Python object to a JSON-friendly dict +(e.g. datetimes to strings, Pydantic models to dicts). + +Taken from FastAPI, and made a bit simpler +https://github.com/tiangolo/fastapi/blob/master/fastapi/encoders.py +""" + +import dataclasses +import datetime as dt +from collections import defaultdict +from enum import Enum +from pathlib import PurePath +from types import GeneratorType +from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Union + +try: + import pydantic.v1 as pydantic # type: ignore +except ImportError: + import pydantic # type: ignore + +from .datetime_utils import serialize_datetime + +SetIntStr = Set[Union[int, str]] +DictIntStrAny = Dict[Union[int, str], Any] + + +def generate_encoders_by_class_tuples( + type_encoder_map: Dict[Any, Callable[[Any], Any]] +) -> Dict[Callable[[Any], Any], Tuple[Any, ...]]: + encoders_by_class_tuples: Dict[Callable[[Any], Any], Tuple[Any, ...]] = defaultdict(tuple) + for type_, encoder in type_encoder_map.items(): + encoders_by_class_tuples[encoder] += (type_,) + return encoders_by_class_tuples + + +encoders_by_class_tuples = generate_encoders_by_class_tuples(pydantic.json.ENCODERS_BY_TYPE) + + +def jsonable_encoder(obj: Any, custom_encoder: Optional[Dict[Any, Callable[[Any], Any]]] = None) -> Any: + custom_encoder = custom_encoder or {} + if custom_encoder: + if type(obj) in custom_encoder: + return custom_encoder[type(obj)](obj) + else: + for encoder_type, encoder_instance in custom_encoder.items(): + if isinstance(obj, encoder_type): + return encoder_instance(obj) + if isinstance(obj, pydantic.BaseModel): + encoder = getattr(obj.__config__, "json_encoders", {}) + if custom_encoder: + encoder.update(custom_encoder) + obj_dict = obj.dict(by_alias=True) + if "__root__" in obj_dict: + obj_dict = obj_dict["__root__"] + return jsonable_encoder(obj_dict, custom_encoder=encoder) + if dataclasses.is_dataclass(obj): + obj_dict = dataclasses.asdict(obj) + return jsonable_encoder(obj_dict, custom_encoder=custom_encoder) + if isinstance(obj, Enum): + return obj.value + if isinstance(obj, PurePath): + return str(obj) + if isinstance(obj, (str, int, float, type(None))): + return obj + if isinstance(obj, dt.date): + return str(obj) + if isinstance(obj, dt.datetime): + return serialize_datetime(obj) + if isinstance(obj, dict): + encoded_dict = {} + allowed_keys = set(obj.keys()) + for key, value in obj.items(): + if key in allowed_keys: + encoded_key = jsonable_encoder(key, custom_encoder=custom_encoder) + encoded_value = jsonable_encoder(value, custom_encoder=custom_encoder) + encoded_dict[encoded_key] = encoded_value + return encoded_dict + if isinstance(obj, (list, set, frozenset, GeneratorType, tuple)): + encoded_list = [] + for item in obj: + encoded_list.append(jsonable_encoder(item, custom_encoder=custom_encoder)) + return encoded_list + + if type(obj) in pydantic.json.ENCODERS_BY_TYPE: + return pydantic.json.ENCODERS_BY_TYPE[type(obj)](obj) + for encoder, classes_tuple in encoders_by_class_tuples.items(): + if isinstance(obj, classes_tuple): + return encoder(obj) + + try: + data = dict(obj) + except Exception as e: + errors: List[Exception] = [] + errors.append(e) + try: + data = vars(obj) + except Exception as e: + errors.append(e) + raise ValueError(errors) from e + return jsonable_encoder(data, custom_encoder=custom_encoder) diff --git a/seed/sdk/optional/src/seed/core/remove_none_from_dict.py b/seed/sdk/optional/src/seed/core/remove_none_from_dict.py new file mode 100644 index 000000000..2da30f713 --- /dev/null +++ b/seed/sdk/optional/src/seed/core/remove_none_from_dict.py @@ -0,0 +1,11 @@ +# This file was auto-generated by Fern from our API Definition. + +from typing import Any, Dict, Optional + + +def remove_none_from_dict(original: Dict[str, Optional[Any]]) -> Dict[str, Any]: + new: Dict[str, Any] = {} + for key, value in original.items(): + if value is not None: + new[key] = value + return new diff --git a/seed/sdk/plain-text/src/seed/resources/service/__init__.py b/seed/sdk/optional/src/seed/optional/__init__.py similarity index 100% rename from seed/sdk/plain-text/src/seed/resources/service/__init__.py rename to seed/sdk/optional/src/seed/optional/__init__.py diff --git a/seed/sdk/optional/src/seed/optional/_client.py b/seed/sdk/optional/src/seed/optional/_client.py new file mode 100644 index 000000000..029ae0935 --- /dev/null +++ b/seed/sdk/optional/src/seed/optional/_client.py @@ -0,0 +1,67 @@ +# This file was auto-generated by Fern from our API Definition. + +import typing +import urllib.parse +from json.decoder import JSONDecodeError + +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder + +try: + import pydantic.v1 as pydantic # type: ignore +except ImportError: + import pydantic # type: ignore + +# this is used as the default value for optional parameters +OMIT = typing.cast(typing.Any, ...) + + +class OptionalClient: + def __init__(self, *, client_wrapper: SyncClientWrapper): + self._client_wrapper = client_wrapper + + def send_optional_body(self, *, request: typing.Optional[typing.Dict[str, typing.Any]] = None) -> str: + """ + Parameters: + - request: typing.Optional[typing.Dict[str, typing.Any]]. + """ + _response = self._client_wrapper.httpx_client.request( + "POST", + urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "send-optional-body"), + json=jsonable_encoder(request), + headers=self._client_wrapper.get_headers(), + timeout=60, + ) + if 200 <= _response.status_code < 300: + return pydantic.parse_obj_as(str, _response.json()) # type: ignore + try: + _response_json = _response.json() + except JSONDecodeError: + raise ApiError(status_code=_response.status_code, body=_response.text) + raise ApiError(status_code=_response.status_code, body=_response_json) + + +class AsyncOptionalClient: + def __init__(self, *, client_wrapper: AsyncClientWrapper): + self._client_wrapper = client_wrapper + + async def send_optional_body(self, *, request: typing.Optional[typing.Dict[str, typing.Any]] = None) -> str: + """ + Parameters: + - request: typing.Optional[typing.Dict[str, typing.Any]]. + """ + _response = await self._client_wrapper.httpx_client.request( + "POST", + urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "send-optional-body"), + json=jsonable_encoder(request), + headers=self._client_wrapper.get_headers(), + timeout=60, + ) + if 200 <= _response.status_code < 300: + return pydantic.parse_obj_as(str, _response.json()) # type: ignore + try: + _response_json = _response.json() + except JSONDecodeError: + raise ApiError(status_code=_response.status_code, body=_response.text) + raise ApiError(status_code=_response.status_code, body=_response_json) diff --git a/seed/sdk/optional/src/seed/py.typed b/seed/sdk/optional/src/seed/py.typed new file mode 100644 index 000000000..e69de29bb diff --git a/seed/sdk/optional/tests/__init__.py b/seed/sdk/optional/tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/seed/sdk/optional/tests/test_client.py b/seed/sdk/optional/tests/test_client.py new file mode 100644 index 000000000..60a58e64c --- /dev/null +++ b/seed/sdk/optional/tests/test_client.py @@ -0,0 +1,6 @@ +import pytest + +# Get started with writing tests with pytest at https://docs.pytest.org +@pytest.mark.skip(reason="Unimplemented") +def test_client() -> None: + assert True == True diff --git a/seed/sdk/package-yml/src/seed/__init__.py b/seed/sdk/package-yml/src/seed/__init__.py index e2f27dfce..43ae725f5 100644 --- a/seed/sdk/package-yml/src/seed/__init__.py +++ b/seed/sdk/package-yml/src/seed/__init__.py @@ -1,5 +1,5 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import service +from . import service __all__ = ["service"] diff --git a/seed/sdk/package-yml/src/seed/client.py b/seed/sdk/package-yml/src/seed/client.py index bdee2a806..8b0fcaeb5 100644 --- a/seed/sdk/package-yml/src/seed/client.py +++ b/seed/sdk/package-yml/src/seed/client.py @@ -9,7 +9,7 @@ from .core.api_error import ApiError from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper from .core.jsonable_encoder import jsonable_encoder -from .resources.service.client import AsyncServiceClient, ServiceClient +from .service._client import AsyncServiceClient, ServiceClient try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/package-yml/src/seed/resources/__init__.py b/seed/sdk/package-yml/src/seed/resources/__init__.py deleted file mode 100644 index 43ae725f5..000000000 --- a/seed/sdk/package-yml/src/seed/resources/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import service - -__all__ = ["service"] diff --git a/seed/sdk/single-url-environment-default/src/seed/resources/dummy/__init__.py b/seed/sdk/package-yml/src/seed/service/__init__.py similarity index 100% rename from seed/sdk/single-url-environment-default/src/seed/resources/dummy/__init__.py rename to seed/sdk/package-yml/src/seed/service/__init__.py diff --git a/seed/sdk/package-yml/src/seed/resources/service/client.py b/seed/sdk/package-yml/src/seed/service/_client.py similarity index 95% rename from seed/sdk/package-yml/src/seed/resources/service/client.py rename to seed/sdk/package-yml/src/seed/service/_client.py index 2ca6bfaac..2f4d37158 100644 --- a/seed/sdk/package-yml/src/seed/resources/service/client.py +++ b/seed/sdk/package-yml/src/seed/service/_client.py @@ -3,8 +3,8 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper class ServiceClient: diff --git a/seed/sdk/plain-text/src/seed/__init__.py b/seed/sdk/plain-text/src/seed/__init__.py index e2f27dfce..43ae725f5 100644 --- a/seed/sdk/plain-text/src/seed/__init__.py +++ b/seed/sdk/plain-text/src/seed/__init__.py @@ -1,5 +1,5 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import service +from . import service __all__ = ["service"] diff --git a/seed/sdk/plain-text/src/seed/client.py b/seed/sdk/plain-text/src/seed/client.py index ad644d6b1..a447aa881 100644 --- a/seed/sdk/plain-text/src/seed/client.py +++ b/seed/sdk/plain-text/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.service.client import AsyncServiceClient, ServiceClient +from .service._client import AsyncServiceClient, ServiceClient class SeedPlainText: diff --git a/seed/sdk/plain-text/src/seed/resources/__init__.py b/seed/sdk/plain-text/src/seed/resources/__init__.py deleted file mode 100644 index 43ae725f5..000000000 --- a/seed/sdk/plain-text/src/seed/resources/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import service - -__all__ = ["service"] diff --git a/seed/sdk/single-url-environment-no-default/src/seed/resources/dummy/__init__.py b/seed/sdk/plain-text/src/seed/service/__init__.py similarity index 100% rename from seed/sdk/single-url-environment-no-default/src/seed/resources/dummy/__init__.py rename to seed/sdk/plain-text/src/seed/service/__init__.py diff --git a/seed/sdk/plain-text/src/seed/resources/service/client.py b/seed/sdk/plain-text/src/seed/service/_client.py similarity index 93% rename from seed/sdk/plain-text/src/seed/resources/service/client.py rename to seed/sdk/plain-text/src/seed/service/_client.py index 871fb2a7f..5d21a3e3d 100644 --- a/seed/sdk/plain-text/src/seed/resources/service/client.py +++ b/seed/sdk/plain-text/src/seed/service/_client.py @@ -3,8 +3,8 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper class ServiceClient: diff --git a/seed/sdk/reserved-keywords/src/seed/__init__.py b/seed/sdk/reserved-keywords/src/seed/__init__.py index 381914ba8..7e5029473 100644 --- a/seed/sdk/reserved-keywords/src/seed/__init__.py +++ b/seed/sdk/reserved-keywords/src/seed/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import Package, Record, package +from . import package +from .package import Package, Record __all__ = ["Package", "Record", "package"] diff --git a/seed/sdk/reserved-keywords/src/seed/client.py b/seed/sdk/reserved-keywords/src/seed/client.py index 7493fe286..0b05624ec 100644 --- a/seed/sdk/reserved-keywords/src/seed/client.py +++ b/seed/sdk/reserved-keywords/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.package.client import AsyncPackageClient, PackageClient +from .package._client import AsyncPackageClient, PackageClient class SeedNurseryApi: diff --git a/seed/sdk/reserved-keywords/src/seed/resources/package/types/__init__.py b/seed/sdk/reserved-keywords/src/seed/package/__init__.py similarity index 100% rename from seed/sdk/reserved-keywords/src/seed/resources/package/types/__init__.py rename to seed/sdk/reserved-keywords/src/seed/package/__init__.py diff --git a/seed/sdk/reserved-keywords/src/seed/resources/package/client.py b/seed/sdk/reserved-keywords/src/seed/package/_client.py similarity index 91% rename from seed/sdk/reserved-keywords/src/seed/resources/package/client.py rename to seed/sdk/reserved-keywords/src/seed/package/_client.py index 5f471e92a..f19f20d05 100644 --- a/seed/sdk/reserved-keywords/src/seed/resources/package/client.py +++ b/seed/sdk/reserved-keywords/src/seed/package/_client.py @@ -2,9 +2,9 @@ from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.remove_none_from_dict import remove_none_from_dict +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.remove_none_from_dict import remove_none_from_dict class PackageClient: diff --git a/seed/sdk/reserved-keywords/src/seed/resources/package/types/package.py b/seed/sdk/reserved-keywords/src/seed/package/package.py similarity index 93% rename from seed/sdk/reserved-keywords/src/seed/resources/package/types/package.py rename to seed/sdk/reserved-keywords/src/seed/package/package.py index 4c3c17e9e..a2da69774 100644 --- a/seed/sdk/reserved-keywords/src/seed/resources/package/types/package.py +++ b/seed/sdk/reserved-keywords/src/seed/package/package.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/reserved-keywords/src/seed/resources/package/types/record.py b/seed/sdk/reserved-keywords/src/seed/package/record.py similarity index 94% rename from seed/sdk/reserved-keywords/src/seed/resources/package/types/record.py rename to seed/sdk/reserved-keywords/src/seed/package/record.py index 95b4fc0ce..67430b59b 100644 --- a/seed/sdk/reserved-keywords/src/seed/resources/package/types/record.py +++ b/seed/sdk/reserved-keywords/src/seed/package/record.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/reserved-keywords/src/seed/resources/__init__.py b/seed/sdk/reserved-keywords/src/seed/resources/__init__.py deleted file mode 100644 index 7e5029473..000000000 --- a/seed/sdk/reserved-keywords/src/seed/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import package -from .package import Package, Record - -__all__ = ["Package", "Record", "package"] diff --git a/seed/sdk/reserved-keywords/src/seed/resources/package/__init__.py b/seed/sdk/reserved-keywords/src/seed/resources/package/__init__.py deleted file mode 100644 index dd92c0e4d..000000000 --- a/seed/sdk/reserved-keywords/src/seed/resources/package/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Package, Record - -__all__ = ["Package", "Record"] diff --git a/seed/sdk/seed.yml b/seed/sdk/seed.yml index 95d8705cf..afc8e5ca1 100644 --- a/seed/sdk/seed.yml +++ b/seed/sdk/seed.yml @@ -33,3 +33,6 @@ scripts: - dmypy run . - pyenv global 3.9 - dmypy run . +allowedFailures: + - enum + - response-property \ No newline at end of file diff --git a/seed/sdk/single-url-environment-default/src/seed/__init__.py b/seed/sdk/single-url-environment-default/src/seed/__init__.py index 64a8610e1..4280c2ccf 100644 --- a/seed/sdk/single-url-environment-default/src/seed/__init__.py +++ b/seed/sdk/single-url-environment-default/src/seed/__init__.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import dummy +from . import dummy from .environment import SeedSingleUrlEnvironmentDefaultEnvironment __all__ = ["SeedSingleUrlEnvironmentDefaultEnvironment", "dummy"] diff --git a/seed/sdk/single-url-environment-default/src/seed/client.py b/seed/sdk/single-url-environment-default/src/seed/client.py index eb177014c..830bd2699 100644 --- a/seed/sdk/single-url-environment-default/src/seed/client.py +++ b/seed/sdk/single-url-environment-default/src/seed/client.py @@ -5,8 +5,8 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .dummy._client import AsyncDummyClient, DummyClient from .environment import SeedSingleUrlEnvironmentDefaultEnvironment -from .resources.dummy.client import AsyncDummyClient, DummyClient class SeedSingleUrlEnvironmentDefault: diff --git a/seed/sdk/trace/src/seed/resources/homepage/__init__.py b/seed/sdk/single-url-environment-default/src/seed/dummy/__init__.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/homepage/__init__.py rename to seed/sdk/single-url-environment-default/src/seed/dummy/__init__.py diff --git a/seed/sdk/single-url-environment-no-default/src/seed/resources/dummy/client.py b/seed/sdk/single-url-environment-default/src/seed/dummy/_client.py similarity index 94% rename from seed/sdk/single-url-environment-no-default/src/seed/resources/dummy/client.py rename to seed/sdk/single-url-environment-default/src/seed/dummy/_client.py index 493911cc6..1ddf7a6e6 100644 --- a/seed/sdk/single-url-environment-no-default/src/seed/resources/dummy/client.py +++ b/seed/sdk/single-url-environment-default/src/seed/dummy/_client.py @@ -3,8 +3,8 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/single-url-environment-default/src/seed/resources/__init__.py b/seed/sdk/single-url-environment-default/src/seed/resources/__init__.py deleted file mode 100644 index c0b290959..000000000 --- a/seed/sdk/single-url-environment-default/src/seed/resources/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import dummy - -__all__ = ["dummy"] diff --git a/seed/sdk/single-url-environment-no-default/src/seed/__init__.py b/seed/sdk/single-url-environment-no-default/src/seed/__init__.py index c76e50682..1b7511476 100644 --- a/seed/sdk/single-url-environment-no-default/src/seed/__init__.py +++ b/seed/sdk/single-url-environment-no-default/src/seed/__init__.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import dummy +from . import dummy from .environment import SeedSingleUrlEnvironmentNoDefaultEnvironment __all__ = ["SeedSingleUrlEnvironmentNoDefaultEnvironment", "dummy"] diff --git a/seed/sdk/single-url-environment-no-default/src/seed/client.py b/seed/sdk/single-url-environment-no-default/src/seed/client.py index dab18b8de..948972761 100644 --- a/seed/sdk/single-url-environment-no-default/src/seed/client.py +++ b/seed/sdk/single-url-environment-no-default/src/seed/client.py @@ -5,8 +5,8 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .dummy._client import AsyncDummyClient, DummyClient from .environment import SeedSingleUrlEnvironmentNoDefaultEnvironment -from .resources.dummy.client import AsyncDummyClient, DummyClient class SeedSingleUrlEnvironmentNoDefault: diff --git a/seed/sdk/trace/src/seed/resources/sysprop/__init__.py b/seed/sdk/single-url-environment-no-default/src/seed/dummy/__init__.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/sysprop/__init__.py rename to seed/sdk/single-url-environment-no-default/src/seed/dummy/__init__.py diff --git a/seed/sdk/no-environment/src/seed/resources/dummy/client.py b/seed/sdk/single-url-environment-no-default/src/seed/dummy/_client.py similarity index 94% rename from seed/sdk/no-environment/src/seed/resources/dummy/client.py rename to seed/sdk/single-url-environment-no-default/src/seed/dummy/_client.py index 493911cc6..1ddf7a6e6 100644 --- a/seed/sdk/no-environment/src/seed/resources/dummy/client.py +++ b/seed/sdk/single-url-environment-no-default/src/seed/dummy/_client.py @@ -3,8 +3,8 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/single-url-environment-no-default/src/seed/resources/__init__.py b/seed/sdk/single-url-environment-no-default/src/seed/resources/__init__.py deleted file mode 100644 index c0b290959..000000000 --- a/seed/sdk/single-url-environment-no-default/src/seed/resources/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import dummy - -__all__ = ["dummy"] diff --git a/seed/sdk/streaming/src/seed/__init__.py b/seed/sdk/streaming/src/seed/__init__.py index 8bc10acdc..aafbcd08b 100644 --- a/seed/sdk/streaming/src/seed/__init__.py +++ b/seed/sdk/streaming/src/seed/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import StreamResponse, dummy +from . import dummy +from .dummy import StreamResponse __all__ = ["StreamResponse", "dummy"] diff --git a/seed/sdk/streaming/src/seed/client.py b/seed/sdk/streaming/src/seed/client.py index b37406bf0..a32e50269 100644 --- a/seed/sdk/streaming/src/seed/client.py +++ b/seed/sdk/streaming/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.dummy.client import AsyncDummyClient, DummyClient +from .dummy._client import AsyncDummyClient, DummyClient class SeedStreaming: diff --git a/seed/sdk/streaming/src/seed/resources/dummy/types/__init__.py b/seed/sdk/streaming/src/seed/dummy/__init__.py similarity index 100% rename from seed/sdk/streaming/src/seed/resources/dummy/types/__init__.py rename to seed/sdk/streaming/src/seed/dummy/__init__.py diff --git a/seed/sdk/streaming/src/seed/resources/dummy/client.py b/seed/sdk/streaming/src/seed/dummy/_client.py similarity index 92% rename from seed/sdk/streaming/src/seed/resources/dummy/client.py rename to seed/sdk/streaming/src/seed/dummy/_client.py index 7de10d0d8..74ec65ed3 100644 --- a/seed/sdk/streaming/src/seed/resources/dummy/client.py +++ b/seed/sdk/streaming/src/seed/dummy/_client.py @@ -5,10 +5,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from .types.stream_response import StreamResponse +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from .stream_response import StreamResponse try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/streaming/src/seed/resources/dummy/types/stream_response.py b/seed/sdk/streaming/src/seed/dummy/stream_response.py similarity index 93% rename from seed/sdk/streaming/src/seed/resources/dummy/types/stream_response.py rename to seed/sdk/streaming/src/seed/dummy/stream_response.py index f3e8ef3cf..7d1a105ca 100644 --- a/seed/sdk/streaming/src/seed/resources/dummy/types/stream_response.py +++ b/seed/sdk/streaming/src/seed/dummy/stream_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/streaming/src/seed/resources/__init__.py b/seed/sdk/streaming/src/seed/resources/__init__.py deleted file mode 100644 index aafbcd08b..000000000 --- a/seed/sdk/streaming/src/seed/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import dummy -from .dummy import StreamResponse - -__all__ = ["StreamResponse", "dummy"] diff --git a/seed/sdk/streaming/src/seed/resources/dummy/__init__.py b/seed/sdk/streaming/src/seed/resources/dummy/__init__.py deleted file mode 100644 index e05fecf74..000000000 --- a/seed/sdk/streaming/src/seed/resources/dummy/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import StreamResponse - -__all__ = ["StreamResponse"] diff --git a/seed/sdk/trace/src/seed/__init__.py b/seed/sdk/trace/src/seed/__init__.py index 97fb761a9..0af4f13a5 100644 --- a/seed/sdk/trace/src/seed/__init__.py +++ b/seed/sdk/trace/src/seed/__init__.py @@ -1,34 +1,11 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import ( - ActualResult, - ActualResult_Exception, - ActualResult_ExceptionV2, - ActualResult_Value, +from . import admin, commons, homepage, lang_server, migration, playlist, problem, submission, sysprop, v_2 +from .admin import Test, Test_And, Test_Or +from .commons import ( BinaryTreeNodeAndTreeValue, BinaryTreeNodeValue, BinaryTreeValue, - BuildingExecutorResponse, - CodeExecutionUpdate, - CodeExecutionUpdate_BuildingExecutor, - CodeExecutionUpdate_Errored, - CodeExecutionUpdate_Finished, - CodeExecutionUpdate_Graded, - CodeExecutionUpdate_GradedV2, - CodeExecutionUpdate_InvalidRequest, - CodeExecutionUpdate_Recorded, - CodeExecutionUpdate_Recording, - CodeExecutionUpdate_Running, - CodeExecutionUpdate_Stopped, - CodeExecutionUpdate_WorkspaceRan, - CompileError, - CreateProblemError, - CreateProblemError_Generic, - CreateProblemRequest, - CreateProblemResponse, - CreateProblemResponse_Error, - CreateProblemResponse_Success, - CustomTestCasesUnsupported, DebugKeyValuePairs, DebugMapValue, DebugVariableValue, @@ -48,6 +25,98 @@ DoublyLinkedListNodeAndListValue, DoublyLinkedListNodeValue, DoublyLinkedListValue, + FileInfo, + GenericValue, + KeyValuePair, + Language, + ListType, + MapType, + MapValue, + NodeId, + ProblemId, + SinglyLinkedListNodeAndListValue, + SinglyLinkedListNodeValue, + SinglyLinkedListValue, + TestCase, + TestCaseWithExpectedResult, + UserId, + VariableType, + VariableType_BinaryTreeType, + VariableType_BooleanType, + VariableType_CharType, + VariableType_DoubleType, + VariableType_DoublyLinkedListType, + VariableType_IntegerType, + VariableType_ListType, + VariableType_MapType, + VariableType_SinglyLinkedListType, + VariableType_StringType, + VariableValue, + VariableValue_BinaryTreeValue, + VariableValue_BooleanValue, + VariableValue_CharValue, + VariableValue_DoubleValue, + VariableValue_DoublyLinkedListValue, + VariableValue_IntegerValue, + VariableValue_ListValue, + VariableValue_MapValue, + VariableValue_NullValue, + VariableValue_SinglyLinkedListValue, + VariableValue_StringValue, +) +from .environment import SeedTraceEnvironment +from .lang_server import LangServerRequest, LangServerResponse +from .migration import Migration, MigrationStatus +from .playlist import ( + Playlist, + PlaylistCreateRequest, + PlaylistId, + PlaylistIdNotFoundError, + PlaylistIdNotFoundErrorBody, + PlaylistIdNotFoundErrorBody_PlaylistId, + ReservedKeywordEnum, + UnauthorizedError, + UpdatePlaylistRequest, +) +from .problem import ( + CreateProblemError, + CreateProblemError_Generic, + CreateProblemRequest, + CreateProblemResponse, + CreateProblemResponse_Error, + CreateProblemResponse_Success, + GenericCreateProblemError, + GetDefaultStarterFilesResponse, + ProblemDescription, + ProblemDescriptionBoard, + ProblemDescriptionBoard_Html, + ProblemDescriptionBoard_TestCaseId, + ProblemDescriptionBoard_Variable, + ProblemFiles, + ProblemInfo, + UpdateProblemResponse, + VariableTypeAndName, +) +from .submission import ( + ActualResult, + ActualResult_Exception, + ActualResult_ExceptionV2, + ActualResult_Value, + BuildingExecutorResponse, + CodeExecutionUpdate, + CodeExecutionUpdate_BuildingExecutor, + CodeExecutionUpdate_Errored, + CodeExecutionUpdate_Finished, + CodeExecutionUpdate_Graded, + CodeExecutionUpdate_GradedV2, + CodeExecutionUpdate_InvalidRequest, + CodeExecutionUpdate_Recorded, + CodeExecutionUpdate_Recording, + CodeExecutionUpdate_Running, + CodeExecutionUpdate_Stopped, + CodeExecutionUpdate_WorkspaceRan, + CompileError, + CustomTestCasesUnsupported, ErrorInfo, ErrorInfo_CompileError, ErrorInfo_InternalError, @@ -62,11 +131,7 @@ ExecutionSessionStatus, ExistingSubmissionExecuting, ExpressionLocation, - FileInfo, FinishedResponse, - GenericCreateProblemError, - GenericValue, - GetDefaultStarterFilesResponse, GetExecutionSessionStateResponse, GetSubmissionStateResponse, GetTraceResponsesPageRequest, @@ -80,43 +145,15 @@ InvalidRequestCause_SubmissionIdNotFound, InvalidRequestCause_UnexpectedLanguage, InvalidRequestResponse, - KeyValuePair, - LangServerRequest, - LangServerResponse, - Language, LightweightStackframeInformation, - ListType, - MapType, - MapValue, - Migration, - MigrationStatus, - NodeId, - Playlist, - PlaylistCreateRequest, - PlaylistId, - PlaylistIdNotFoundError, - PlaylistIdNotFoundErrorBody, - PlaylistIdNotFoundErrorBody_PlaylistId, - ProblemDescription, - ProblemDescriptionBoard, - ProblemDescriptionBoard_Html, - ProblemDescriptionBoard_TestCaseId, - ProblemDescriptionBoard_Variable, - ProblemFiles, - ProblemId, - ProblemInfo, RecordedResponseNotification, RecordedTestCaseUpdate, RecordingResponseNotification, - ReservedKeywordEnum, RunningResponse, RunningSubmissionState, RuntimeError, Scope, ShareId, - SinglyLinkedListNodeAndListValue, - SinglyLinkedListNodeValue, - SinglyLinkedListValue, StackFrame, StackInformation, StderrResponse, @@ -152,8 +189,6 @@ SubmissionTypeState_Workspace, SubmitRequestV2, TerminatedResponse, - Test, - TestCase, TestCaseGrade, TestCaseGrade_Hidden, TestCaseGrade_NonHidden, @@ -161,7 +196,6 @@ TestCaseNonHiddenGrade, TestCaseResult, TestCaseResultWithStdout, - TestCaseWithExpectedResult, TestSubmissionState, TestSubmissionStatus, TestSubmissionStatusV2, @@ -177,43 +211,13 @@ TestSubmissionUpdateInfo_RecordedTestCase, TestSubmissionUpdateInfo_Running, TestSubmissionUpdateInfo_Stopped, - Test_And, - Test_Or, TraceResponse, TraceResponseV2, TraceResponsesPage, TraceResponsesPageV2, TracedFile, TracedTestCase, - UnauthorizedError, UnexpectedLanguageError, - UpdatePlaylistRequest, - UpdateProblemResponse, - UserId, - VariableType, - VariableTypeAndName, - VariableType_BinaryTreeType, - VariableType_BooleanType, - VariableType_CharType, - VariableType_DoubleType, - VariableType_DoublyLinkedListType, - VariableType_IntegerType, - VariableType_ListType, - VariableType_MapType, - VariableType_SinglyLinkedListType, - VariableType_StringType, - VariableValue, - VariableValue_BinaryTreeValue, - VariableValue_BooleanValue, - VariableValue_CharValue, - VariableValue_DoubleValue, - VariableValue_DoublyLinkedListValue, - VariableValue_IntegerValue, - VariableValue_ListValue, - VariableValue_MapValue, - VariableValue_NullValue, - VariableValue_SinglyLinkedListValue, - VariableValue_StringValue, WorkspaceFiles, WorkspaceRanResponse, WorkspaceRunDetails, @@ -238,18 +242,7 @@ WorkspaceSubmissionUpdateInfo_TracedV2, WorkspaceSubmitRequest, WorkspaceTracedUpdate, - admin, - commons, - homepage, - lang_server, - migration, - playlist, - problem, - submission, - sysprop, - v_2, ) -from .environment import SeedTraceEnvironment __all__ = [ "ActualResult", diff --git a/seed/sdk/trace/src/seed/resources/admin/types/__init__.py b/seed/sdk/trace/src/seed/admin/__init__.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/admin/types/__init__.py rename to seed/sdk/trace/src/seed/admin/__init__.py diff --git a/seed/sdk/trace/src/seed/resources/admin/client.py b/seed/sdk/trace/src/seed/admin/_client.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/admin/client.py rename to seed/sdk/trace/src/seed/admin/_client.py index 130e73236..9a9436840 100644 --- a/seed/sdk/trace/src/seed/resources/admin/client.py +++ b/seed/sdk/trace/src/seed/admin/_client.py @@ -4,19 +4,19 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..submission.types.submission_id import SubmissionId -from ..submission.types.test_case_result_with_stdout import TestCaseResultWithStdout -from ..submission.types.test_submission_status import TestSubmissionStatus -from ..submission.types.test_submission_update import TestSubmissionUpdate -from ..submission.types.trace_response import TraceResponse -from ..submission.types.trace_response_v_2 import TraceResponseV2 -from ..submission.types.workspace_run_details import WorkspaceRunDetails -from ..submission.types.workspace_submission_status import WorkspaceSubmissionStatus -from ..submission.types.workspace_submission_update import WorkspaceSubmissionUpdate -from ..v_2.resources.problem.types.test_case_id import TestCaseId +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from ..submission.submission_id import SubmissionId +from ..submission.test_case_result_with_stdout import TestCaseResultWithStdout +from ..submission.test_submission_status import TestSubmissionStatus +from ..submission.test_submission_update import TestSubmissionUpdate +from ..submission.trace_response import TraceResponse +from ..submission.trace_response_v_2 import TraceResponseV2 +from ..submission.workspace_run_details import WorkspaceRunDetails +from ..submission.workspace_submission_status import WorkspaceSubmissionStatus +from ..submission.workspace_submission_update import WorkspaceSubmissionUpdate +from ..v_2.problem.test_case_id import TestCaseId # this is used as the default value for optional parameters OMIT = typing.cast(typing.Any, ...) diff --git a/seed/sdk/trace/src/seed/resources/admin/types/test.py b/seed/sdk/trace/src/seed/admin/test.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/admin/types/test.py rename to seed/sdk/trace/src/seed/admin/test.py diff --git a/seed/sdk/trace/src/seed/client.py b/seed/sdk/trace/src/seed/client.py index 45d077f63..93f3de4f3 100644 --- a/seed/sdk/trace/src/seed/client.py +++ b/seed/sdk/trace/src/seed/client.py @@ -4,16 +4,16 @@ import httpx +from .admin._client import AdminClient, AsyncAdminClient from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper from .environment import SeedTraceEnvironment -from .resources.admin.client import AdminClient, AsyncAdminClient -from .resources.homepage.client import AsyncHomepageClient, HomepageClient -from .resources.migration.client import AsyncMigrationClient, MigrationClient -from .resources.playlist.client import AsyncPlaylistClient, PlaylistClient -from .resources.problem.client import AsyncProblemClient, ProblemClient -from .resources.submission.client import AsyncSubmissionClient, SubmissionClient -from .resources.sysprop.client import AsyncSyspropClient, SyspropClient -from .resources.v_2.client import AsyncV2Client, V2Client +from .homepage._client import AsyncHomepageClient, HomepageClient +from .migration._client import AsyncMigrationClient, MigrationClient +from .playlist._client import AsyncPlaylistClient, PlaylistClient +from .problem._client import AsyncProblemClient, ProblemClient +from .submission._client import AsyncSubmissionClient, SubmissionClient +from .sysprop._client import AsyncSyspropClient, SyspropClient +from .v_2._client import AsyncV2Client, V2Client class SeedTrace: diff --git a/seed/sdk/trace/src/seed/resources/commons/types/__init__.py b/seed/sdk/trace/src/seed/commons/__init__.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/commons/types/__init__.py rename to seed/sdk/trace/src/seed/commons/__init__.py diff --git a/seed/sdk/trace/src/seed/resources/commons/types/binary_tree_node_and_tree_value.py b/seed/sdk/trace/src/seed/commons/binary_tree_node_and_tree_value.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/commons/types/binary_tree_node_and_tree_value.py rename to seed/sdk/trace/src/seed/commons/binary_tree_node_and_tree_value.py index 1ea49493c..a6559d861 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/binary_tree_node_and_tree_value.py +++ b/seed/sdk/trace/src/seed/commons/binary_tree_node_and_tree_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .binary_tree_value import BinaryTreeValue from .node_id import NodeId diff --git a/seed/sdk/trace/src/seed/resources/commons/types/binary_tree_node_value.py b/seed/sdk/trace/src/seed/commons/binary_tree_node_value.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/commons/types/binary_tree_node_value.py rename to seed/sdk/trace/src/seed/commons/binary_tree_node_value.py index 0ad8cd712..15388abb0 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/binary_tree_node_value.py +++ b/seed/sdk/trace/src/seed/commons/binary_tree_node_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .node_id import NodeId try: diff --git a/seed/sdk/trace/src/seed/resources/commons/types/binary_tree_value.py b/seed/sdk/trace/src/seed/commons/binary_tree_value.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/commons/types/binary_tree_value.py rename to seed/sdk/trace/src/seed/commons/binary_tree_value.py index a1ee78c3e..8548429e2 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/binary_tree_value.py +++ b/seed/sdk/trace/src/seed/commons/binary_tree_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .binary_tree_node_value import BinaryTreeNodeValue from .node_id import NodeId diff --git a/seed/sdk/trace/src/seed/resources/commons/types/debug_key_value_pairs.py b/seed/sdk/trace/src/seed/commons/debug_key_value_pairs.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/commons/types/debug_key_value_pairs.py rename to seed/sdk/trace/src/seed/commons/debug_key_value_pairs.py index e75aca664..87a18260e 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/debug_key_value_pairs.py +++ b/seed/sdk/trace/src/seed/commons/debug_key_value_pairs.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/commons/types/debug_map_value.py b/seed/sdk/trace/src/seed/commons/debug_map_value.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/commons/types/debug_map_value.py rename to seed/sdk/trace/src/seed/commons/debug_map_value.py index 23679ed58..e3bebd6b2 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/debug_map_value.py +++ b/seed/sdk/trace/src/seed/commons/debug_map_value.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/commons/types/debug_variable_value.py b/seed/sdk/trace/src/seed/commons/debug_variable_value.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/commons/types/debug_variable_value.py rename to seed/sdk/trace/src/seed/commons/debug_variable_value.py diff --git a/seed/sdk/trace/src/seed/resources/commons/types/doubly_linked_list_node_and_list_value.py b/seed/sdk/trace/src/seed/commons/doubly_linked_list_node_and_list_value.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/commons/types/doubly_linked_list_node_and_list_value.py rename to seed/sdk/trace/src/seed/commons/doubly_linked_list_node_and_list_value.py index 9b8102466..b53bcdee9 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/doubly_linked_list_node_and_list_value.py +++ b/seed/sdk/trace/src/seed/commons/doubly_linked_list_node_and_list_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .doubly_linked_list_value import DoublyLinkedListValue from .node_id import NodeId diff --git a/seed/sdk/trace/src/seed/resources/commons/types/doubly_linked_list_node_value.py b/seed/sdk/trace/src/seed/commons/doubly_linked_list_node_value.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/commons/types/doubly_linked_list_node_value.py rename to seed/sdk/trace/src/seed/commons/doubly_linked_list_node_value.py index 8e159e970..91d2570b7 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/doubly_linked_list_node_value.py +++ b/seed/sdk/trace/src/seed/commons/doubly_linked_list_node_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .node_id import NodeId try: diff --git a/seed/sdk/trace/src/seed/resources/commons/types/doubly_linked_list_value.py b/seed/sdk/trace/src/seed/commons/doubly_linked_list_value.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/commons/types/doubly_linked_list_value.py rename to seed/sdk/trace/src/seed/commons/doubly_linked_list_value.py index fb0995e21..8d2859a77 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/doubly_linked_list_value.py +++ b/seed/sdk/trace/src/seed/commons/doubly_linked_list_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .doubly_linked_list_node_value import DoublyLinkedListNodeValue from .node_id import NodeId diff --git a/seed/sdk/trace/src/seed/resources/commons/types/file_info.py b/seed/sdk/trace/src/seed/commons/file_info.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/commons/types/file_info.py rename to seed/sdk/trace/src/seed/commons/file_info.py index 0d1331ef8..acb138c90 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/file_info.py +++ b/seed/sdk/trace/src/seed/commons/file_info.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/commons/types/generic_value.py b/seed/sdk/trace/src/seed/commons/generic_value.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/commons/types/generic_value.py rename to seed/sdk/trace/src/seed/commons/generic_value.py index e6e6658cc..f6eaf3ced 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/generic_value.py +++ b/seed/sdk/trace/src/seed/commons/generic_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/commons/types/key_value_pair.py b/seed/sdk/trace/src/seed/commons/key_value_pair.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/commons/types/key_value_pair.py rename to seed/sdk/trace/src/seed/commons/key_value_pair.py index 030f10c93..4b5e2ad9d 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/key_value_pair.py +++ b/seed/sdk/trace/src/seed/commons/key_value_pair.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/commons/types/language.py b/seed/sdk/trace/src/seed/commons/language.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/commons/types/language.py rename to seed/sdk/trace/src/seed/commons/language.py diff --git a/seed/sdk/trace/src/seed/resources/commons/types/list_type.py b/seed/sdk/trace/src/seed/commons/list_type.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/commons/types/list_type.py rename to seed/sdk/trace/src/seed/commons/list_type.py index 42ec32771..4ae625d51 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/list_type.py +++ b/seed/sdk/trace/src/seed/commons/list_type.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/commons/types/map_type.py b/seed/sdk/trace/src/seed/commons/map_type.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/commons/types/map_type.py rename to seed/sdk/trace/src/seed/commons/map_type.py index 396bdb6ea..c7e7c0480 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/map_type.py +++ b/seed/sdk/trace/src/seed/commons/map_type.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/commons/types/map_value.py b/seed/sdk/trace/src/seed/commons/map_value.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/commons/types/map_value.py rename to seed/sdk/trace/src/seed/commons/map_value.py index d036920c6..08cb8cc4c 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/map_value.py +++ b/seed/sdk/trace/src/seed/commons/map_value.py @@ -5,7 +5,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/commons/types/node_id.py b/seed/sdk/trace/src/seed/commons/node_id.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/commons/types/node_id.py rename to seed/sdk/trace/src/seed/commons/node_id.py diff --git a/seed/sdk/trace/src/seed/resources/commons/types/problem_id.py b/seed/sdk/trace/src/seed/commons/problem_id.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/commons/types/problem_id.py rename to seed/sdk/trace/src/seed/commons/problem_id.py diff --git a/seed/sdk/trace/src/seed/resources/commons/types/singly_linked_list_node_and_list_value.py b/seed/sdk/trace/src/seed/commons/singly_linked_list_node_and_list_value.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/commons/types/singly_linked_list_node_and_list_value.py rename to seed/sdk/trace/src/seed/commons/singly_linked_list_node_and_list_value.py index 6ef104edb..b2c64f481 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/singly_linked_list_node_and_list_value.py +++ b/seed/sdk/trace/src/seed/commons/singly_linked_list_node_and_list_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .node_id import NodeId from .singly_linked_list_value import SinglyLinkedListValue diff --git a/seed/sdk/trace/src/seed/resources/commons/types/singly_linked_list_node_value.py b/seed/sdk/trace/src/seed/commons/singly_linked_list_node_value.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/commons/types/singly_linked_list_node_value.py rename to seed/sdk/trace/src/seed/commons/singly_linked_list_node_value.py index 7842f1e25..2a9f1407c 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/singly_linked_list_node_value.py +++ b/seed/sdk/trace/src/seed/commons/singly_linked_list_node_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .node_id import NodeId try: diff --git a/seed/sdk/trace/src/seed/resources/commons/types/singly_linked_list_value.py b/seed/sdk/trace/src/seed/commons/singly_linked_list_value.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/commons/types/singly_linked_list_value.py rename to seed/sdk/trace/src/seed/commons/singly_linked_list_value.py index aef76c7af..410434133 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/singly_linked_list_value.py +++ b/seed/sdk/trace/src/seed/commons/singly_linked_list_value.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .node_id import NodeId from .singly_linked_list_node_value import SinglyLinkedListNodeValue diff --git a/seed/sdk/trace/src/seed/resources/commons/types/test_case.py b/seed/sdk/trace/src/seed/commons/test_case.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/commons/types/test_case.py rename to seed/sdk/trace/src/seed/commons/test_case.py index beba2b5d1..1762dfbd2 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/test_case.py +++ b/seed/sdk/trace/src/seed/commons/test_case.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .variable_value import VariableValue try: diff --git a/seed/sdk/trace/src/seed/resources/commons/types/test_case_with_expected_result.py b/seed/sdk/trace/src/seed/commons/test_case_with_expected_result.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/commons/types/test_case_with_expected_result.py rename to seed/sdk/trace/src/seed/commons/test_case_with_expected_result.py index 9877f752f..e0981b45f 100644 --- a/seed/sdk/trace/src/seed/resources/commons/types/test_case_with_expected_result.py +++ b/seed/sdk/trace/src/seed/commons/test_case_with_expected_result.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .test_case import TestCase from .variable_value import VariableValue diff --git a/seed/sdk/trace/src/seed/resources/commons/types/user_id.py b/seed/sdk/trace/src/seed/commons/user_id.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/commons/types/user_id.py rename to seed/sdk/trace/src/seed/commons/user_id.py diff --git a/seed/sdk/trace/src/seed/resources/commons/types/variable_type.py b/seed/sdk/trace/src/seed/commons/variable_type.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/commons/types/variable_type.py rename to seed/sdk/trace/src/seed/commons/variable_type.py diff --git a/seed/sdk/trace/src/seed/resources/commons/types/variable_value.py b/seed/sdk/trace/src/seed/commons/variable_value.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/commons/types/variable_value.py rename to seed/sdk/trace/src/seed/commons/variable_value.py diff --git a/seed/sdk/variables/src/seed/resources/service/__init__.py b/seed/sdk/trace/src/seed/homepage/__init__.py similarity index 100% rename from seed/sdk/variables/src/seed/resources/service/__init__.py rename to seed/sdk/trace/src/seed/homepage/__init__.py diff --git a/seed/sdk/trace/src/seed/resources/homepage/client.py b/seed/sdk/trace/src/seed/homepage/_client.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/homepage/client.py rename to seed/sdk/trace/src/seed/homepage/_client.py index 591ca04d3..959d02125 100644 --- a/seed/sdk/trace/src/seed/resources/homepage/client.py +++ b/seed/sdk/trace/src/seed/homepage/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..commons.types.problem_id import ProblemId +from ..commons.problem_id import ProblemId +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/lang_server/types/__init__.py b/seed/sdk/trace/src/seed/lang_server/__init__.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/lang_server/types/__init__.py rename to seed/sdk/trace/src/seed/lang_server/__init__.py diff --git a/seed/sdk/trace/src/seed/resources/lang_server/types/lang_server_request.py b/seed/sdk/trace/src/seed/lang_server/lang_server_request.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/lang_server/types/lang_server_request.py rename to seed/sdk/trace/src/seed/lang_server/lang_server_request.py index f52a4e748..1333dd288 100644 --- a/seed/sdk/trace/src/seed/resources/lang_server/types/lang_server_request.py +++ b/seed/sdk/trace/src/seed/lang_server/lang_server_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/lang_server/types/lang_server_response.py b/seed/sdk/trace/src/seed/lang_server/lang_server_response.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/lang_server/types/lang_server_response.py rename to seed/sdk/trace/src/seed/lang_server/lang_server_response.py index 15654a558..b0cf199fd 100644 --- a/seed/sdk/trace/src/seed/resources/lang_server/types/lang_server_response.py +++ b/seed/sdk/trace/src/seed/lang_server/lang_server_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/migration/types/__init__.py b/seed/sdk/trace/src/seed/migration/__init__.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/migration/types/__init__.py rename to seed/sdk/trace/src/seed/migration/__init__.py diff --git a/seed/sdk/trace/src/seed/resources/migration/client.py b/seed/sdk/trace/src/seed/migration/_client.py similarity index 91% rename from seed/sdk/trace/src/seed/resources/migration/client.py rename to seed/sdk/trace/src/seed/migration/_client.py index ab57e6b67..e08fa58c1 100644 --- a/seed/sdk/trace/src/seed/resources/migration/client.py +++ b/seed/sdk/trace/src/seed/migration/_client.py @@ -4,10 +4,10 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.remove_none_from_dict import remove_none_from_dict -from .types.migration import Migration +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.remove_none_from_dict import remove_none_from_dict +from .migration import Migration try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/migration/types/migration.py b/seed/sdk/trace/src/seed/migration/migration.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/migration/types/migration.py rename to seed/sdk/trace/src/seed/migration/migration.py index b41f9ff92..7d7774615 100644 --- a/seed/sdk/trace/src/seed/resources/migration/types/migration.py +++ b/seed/sdk/trace/src/seed/migration/migration.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .migration_status import MigrationStatus try: diff --git a/seed/sdk/trace/src/seed/resources/migration/types/migration_status.py b/seed/sdk/trace/src/seed/migration/migration_status.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/migration/types/migration_status.py rename to seed/sdk/trace/src/seed/migration/migration_status.py diff --git a/seed/sdk/trace/src/seed/resources/playlist/types/__init__.py b/seed/sdk/trace/src/seed/playlist/__init__.py similarity index 78% rename from seed/sdk/trace/src/seed/resources/playlist/types/__init__.py rename to seed/sdk/trace/src/seed/playlist/__init__.py index d4667234a..d97e610d0 100644 --- a/seed/sdk/trace/src/seed/resources/playlist/types/__init__.py +++ b/seed/sdk/trace/src/seed/playlist/__init__.py @@ -3,16 +3,20 @@ from .playlist import Playlist from .playlist_create_request import PlaylistCreateRequest from .playlist_id import PlaylistId +from .playlist_id_not_found_error import PlaylistIdNotFoundError from .playlist_id_not_found_error_body import PlaylistIdNotFoundErrorBody, PlaylistIdNotFoundErrorBody_PlaylistId from .reserved_keyword_enum import ReservedKeywordEnum +from .unauthorized_error import UnauthorizedError from .update_playlist_request import UpdatePlaylistRequest __all__ = [ "Playlist", "PlaylistCreateRequest", "PlaylistId", + "PlaylistIdNotFoundError", "PlaylistIdNotFoundErrorBody", "PlaylistIdNotFoundErrorBody_PlaylistId", "ReservedKeywordEnum", + "UnauthorizedError", "UpdatePlaylistRequest", ] diff --git a/seed/sdk/trace/src/seed/resources/playlist/client.py b/seed/sdk/trace/src/seed/playlist/_client.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/playlist/client.py rename to seed/sdk/trace/src/seed/playlist/_client.py index 88ad29aff..5a439ac7b 100644 --- a/seed/sdk/trace/src/seed/resources/playlist/client.py +++ b/seed/sdk/trace/src/seed/playlist/_client.py @@ -5,18 +5,18 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.datetime_utils import serialize_datetime -from ...core.jsonable_encoder import jsonable_encoder -from ...core.remove_none_from_dict import remove_none_from_dict -from .errors.playlist_id_not_found_error import PlaylistIdNotFoundError -from .errors.unauthorized_error import UnauthorizedError -from .types.playlist import Playlist -from .types.playlist_create_request import PlaylistCreateRequest -from .types.playlist_id import PlaylistId -from .types.playlist_id_not_found_error_body import PlaylistIdNotFoundErrorBody -from .types.update_playlist_request import UpdatePlaylistRequest +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.datetime_utils import serialize_datetime +from ..core.jsonable_encoder import jsonable_encoder +from ..core.remove_none_from_dict import remove_none_from_dict +from .playlist import Playlist +from .playlist_create_request import PlaylistCreateRequest +from .playlist_id import PlaylistId +from .playlist_id_not_found_error import PlaylistIdNotFoundError +from .playlist_id_not_found_error_body import PlaylistIdNotFoundErrorBody +from .unauthorized_error import UnauthorizedError +from .update_playlist_request import UpdatePlaylistRequest try: import pydantic.v1 as pydantic # type: ignore @@ -96,7 +96,6 @@ def get_playlists( - multi_line_docs: str. I'm a multiline description - - optional_multiple_field: typing.Optional[typing.Union[str, typing.List[str]]]. - multiple_field: typing.Union[str, typing.List[str]]. @@ -286,7 +285,6 @@ async def get_playlists( - multi_line_docs: str. I'm a multiline description - - optional_multiple_field: typing.Optional[typing.Union[str, typing.List[str]]]. - multiple_field: typing.Union[str, typing.List[str]]. diff --git a/seed/sdk/trace/src/seed/resources/playlist/types/playlist.py b/seed/sdk/trace/src/seed/playlist/playlist.py similarity index 91% rename from seed/sdk/trace/src/seed/resources/playlist/types/playlist.py rename to seed/sdk/trace/src/seed/playlist/playlist.py index ec768c0fc..9a47a6ce2 100644 --- a/seed/sdk/trace/src/seed/resources/playlist/types/playlist.py +++ b/seed/sdk/trace/src/seed/playlist/playlist.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.user_id import UserId +from ..commons.user_id import UserId +from ..core.datetime_utils import serialize_datetime from .playlist_create_request import PlaylistCreateRequest from .playlist_id import PlaylistId diff --git a/seed/sdk/trace/src/seed/resources/playlist/types/playlist_create_request.py b/seed/sdk/trace/src/seed/playlist/playlist_create_request.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/playlist/types/playlist_create_request.py rename to seed/sdk/trace/src/seed/playlist/playlist_create_request.py index eeb8edcda..0d3f50227 100644 --- a/seed/sdk/trace/src/seed/resources/playlist/types/playlist_create_request.py +++ b/seed/sdk/trace/src/seed/playlist/playlist_create_request.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.problem_id import ProblemId +from ..commons.problem_id import ProblemId +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/playlist/types/playlist_id.py b/seed/sdk/trace/src/seed/playlist/playlist_id.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/playlist/types/playlist_id.py rename to seed/sdk/trace/src/seed/playlist/playlist_id.py diff --git a/seed/sdk/trace/src/seed/resources/playlist/errors/playlist_id_not_found_error.py b/seed/sdk/trace/src/seed/playlist/playlist_id_not_found_error.py similarity index 64% rename from seed/sdk/trace/src/seed/resources/playlist/errors/playlist_id_not_found_error.py rename to seed/sdk/trace/src/seed/playlist/playlist_id_not_found_error.py index 715c4787c..224fd4e01 100644 --- a/seed/sdk/trace/src/seed/resources/playlist/errors/playlist_id_not_found_error.py +++ b/seed/sdk/trace/src/seed/playlist/playlist_id_not_found_error.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.api_error import ApiError -from ..types.playlist_id_not_found_error_body import PlaylistIdNotFoundErrorBody +from ..core.api_error import ApiError +from .playlist_id_not_found_error_body import PlaylistIdNotFoundErrorBody class PlaylistIdNotFoundError(ApiError): diff --git a/seed/sdk/trace/src/seed/resources/playlist/types/playlist_id_not_found_error_body.py b/seed/sdk/trace/src/seed/playlist/playlist_id_not_found_error_body.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/playlist/types/playlist_id_not_found_error_body.py rename to seed/sdk/trace/src/seed/playlist/playlist_id_not_found_error_body.py diff --git a/seed/sdk/trace/src/seed/resources/playlist/types/reserved_keyword_enum.py b/seed/sdk/trace/src/seed/playlist/reserved_keyword_enum.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/playlist/types/reserved_keyword_enum.py rename to seed/sdk/trace/src/seed/playlist/reserved_keyword_enum.py diff --git a/seed/sdk/trace/src/seed/resources/playlist/errors/unauthorized_error.py b/seed/sdk/trace/src/seed/playlist/unauthorized_error.py similarity index 81% rename from seed/sdk/trace/src/seed/resources/playlist/errors/unauthorized_error.py rename to seed/sdk/trace/src/seed/playlist/unauthorized_error.py index e13161d6c..d7885aa6c 100644 --- a/seed/sdk/trace/src/seed/resources/playlist/errors/unauthorized_error.py +++ b/seed/sdk/trace/src/seed/playlist/unauthorized_error.py @@ -1,6 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from ....core.api_error import ApiError +from ..core.api_error import ApiError class UnauthorizedError(ApiError): diff --git a/seed/sdk/trace/src/seed/resources/playlist/types/update_playlist_request.py b/seed/sdk/trace/src/seed/playlist/update_playlist_request.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/playlist/types/update_playlist_request.py rename to seed/sdk/trace/src/seed/playlist/update_playlist_request.py index e9739a689..c01f3cee2 100644 --- a/seed/sdk/trace/src/seed/resources/playlist/types/update_playlist_request.py +++ b/seed/sdk/trace/src/seed/playlist/update_playlist_request.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.problem_id import ProblemId +from ..commons.problem_id import ProblemId +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/problem/types/__init__.py b/seed/sdk/trace/src/seed/problem/__init__.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/problem/types/__init__.py rename to seed/sdk/trace/src/seed/problem/__init__.py diff --git a/seed/sdk/trace/src/seed/resources/problem/client.py b/seed/sdk/trace/src/seed/problem/_client.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/problem/client.py rename to seed/sdk/trace/src/seed/problem/_client.py index cda34cfc0..1aa2c07ae 100644 --- a/seed/sdk/trace/src/seed/resources/problem/client.py +++ b/seed/sdk/trace/src/seed/problem/_client.py @@ -4,16 +4,16 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from ..commons.types.problem_id import ProblemId -from ..commons.types.variable_type import VariableType -from .types.create_problem_request import CreateProblemRequest -from .types.create_problem_response import CreateProblemResponse -from .types.get_default_starter_files_response import GetDefaultStarterFilesResponse -from .types.update_problem_response import UpdateProblemResponse -from .types.variable_type_and_name import VariableTypeAndName +from ..commons.problem_id import ProblemId +from ..commons.variable_type import VariableType +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from .create_problem_request import CreateProblemRequest +from .create_problem_response import CreateProblemResponse +from .get_default_starter_files_response import GetDefaultStarterFilesResponse +from .update_problem_response import UpdateProblemResponse +from .variable_type_and_name import VariableTypeAndName try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/problem/types/create_problem_error.py b/seed/sdk/trace/src/seed/problem/create_problem_error.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/problem/types/create_problem_error.py rename to seed/sdk/trace/src/seed/problem/create_problem_error.py diff --git a/seed/sdk/trace/src/seed/resources/problem/types/create_problem_request.py b/seed/sdk/trace/src/seed/problem/create_problem_request.py similarity index 85% rename from seed/sdk/trace/src/seed/resources/problem/types/create_problem_request.py rename to seed/sdk/trace/src/seed/problem/create_problem_request.py index c2f0b7bea..272974974 100644 --- a/seed/sdk/trace/src/seed/resources/problem/types/create_problem_request.py +++ b/seed/sdk/trace/src/seed/problem/create_problem_request.py @@ -3,10 +3,10 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.language import Language -from ...commons.types.test_case_with_expected_result import TestCaseWithExpectedResult -from ...commons.types.variable_type import VariableType +from ..commons.language import Language +from ..commons.test_case_with_expected_result import TestCaseWithExpectedResult +from ..commons.variable_type import VariableType +from ..core.datetime_utils import serialize_datetime from .problem_description import ProblemDescription from .problem_files import ProblemFiles from .variable_type_and_name import VariableTypeAndName diff --git a/seed/sdk/trace/src/seed/resources/problem/types/create_problem_response.py b/seed/sdk/trace/src/seed/problem/create_problem_response.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/problem/types/create_problem_response.py rename to seed/sdk/trace/src/seed/problem/create_problem_response.py index aec5ff8e1..b18ccc88a 100644 --- a/seed/sdk/trace/src/seed/resources/problem/types/create_problem_response.py +++ b/seed/sdk/trace/src/seed/problem/create_problem_response.py @@ -6,7 +6,7 @@ import typing_extensions -from ...commons.types.problem_id import ProblemId +from ..commons.problem_id import ProblemId from .create_problem_error import CreateProblemError try: diff --git a/seed/sdk/trace/src/seed/resources/problem/types/generic_create_problem_error.py b/seed/sdk/trace/src/seed/problem/generic_create_problem_error.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/problem/types/generic_create_problem_error.py rename to seed/sdk/trace/src/seed/problem/generic_create_problem_error.py index e2f9db46d..3feddd533 100644 --- a/seed/sdk/trace/src/seed/resources/problem/types/generic_create_problem_error.py +++ b/seed/sdk/trace/src/seed/problem/generic_create_problem_error.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/problem/types/get_default_starter_files_response.py b/seed/sdk/trace/src/seed/problem/get_default_starter_files_response.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/problem/types/get_default_starter_files_response.py rename to seed/sdk/trace/src/seed/problem/get_default_starter_files_response.py index a672447c8..ab6d74973 100644 --- a/seed/sdk/trace/src/seed/resources/problem/types/get_default_starter_files_response.py +++ b/seed/sdk/trace/src/seed/problem/get_default_starter_files_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.language import Language +from ..commons.language import Language +from ..core.datetime_utils import serialize_datetime from .problem_files import ProblemFiles try: diff --git a/seed/sdk/trace/src/seed/resources/problem/types/problem_description.py b/seed/sdk/trace/src/seed/problem/problem_description.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/problem/types/problem_description.py rename to seed/sdk/trace/src/seed/problem/problem_description.py index c26879521..a82e8d81c 100644 --- a/seed/sdk/trace/src/seed/resources/problem/types/problem_description.py +++ b/seed/sdk/trace/src/seed/problem/problem_description.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .problem_description_board import ProblemDescriptionBoard try: diff --git a/seed/sdk/trace/src/seed/resources/problem/types/problem_description_board.py b/seed/sdk/trace/src/seed/problem/problem_description_board.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/problem/types/problem_description_board.py rename to seed/sdk/trace/src/seed/problem/problem_description_board.py index 728c0aad0..f5ad64638 100644 --- a/seed/sdk/trace/src/seed/resources/problem/types/problem_description_board.py +++ b/seed/sdk/trace/src/seed/problem/problem_description_board.py @@ -42,4 +42,4 @@ class Config: ProblemDescriptionBoard = typing.Union[ ProblemDescriptionBoard_Html, ProblemDescriptionBoard_Variable, ProblemDescriptionBoard_TestCaseId ] -from ...commons.types.variable_value import VariableValue # noqa: E402 +from ..commons.variable_value import VariableValue # noqa: E402 diff --git a/seed/sdk/trace/src/seed/resources/problem/types/problem_files.py b/seed/sdk/trace/src/seed/problem/problem_files.py similarity index 90% rename from seed/sdk/trace/src/seed/resources/problem/types/problem_files.py rename to seed/sdk/trace/src/seed/problem/problem_files.py index 01e6f2522..08849ec29 100644 --- a/seed/sdk/trace/src/seed/resources/problem/types/problem_files.py +++ b/seed/sdk/trace/src/seed/problem/problem_files.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.file_info import FileInfo +from ..commons.file_info import FileInfo +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/problem/types/problem_info.py b/seed/sdk/trace/src/seed/problem/problem_info.py similarity index 85% rename from seed/sdk/trace/src/seed/resources/problem/types/problem_info.py rename to seed/sdk/trace/src/seed/problem/problem_info.py index 663daab1c..07a3869ff 100644 --- a/seed/sdk/trace/src/seed/resources/problem/types/problem_info.py +++ b/seed/sdk/trace/src/seed/problem/problem_info.py @@ -3,11 +3,11 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.language import Language -from ...commons.types.problem_id import ProblemId -from ...commons.types.test_case_with_expected_result import TestCaseWithExpectedResult -from ...commons.types.variable_type import VariableType +from ..commons.language import Language +from ..commons.problem_id import ProblemId +from ..commons.test_case_with_expected_result import TestCaseWithExpectedResult +from ..commons.variable_type import VariableType +from ..core.datetime_utils import serialize_datetime from .problem_description import ProblemDescription from .problem_files import ProblemFiles from .variable_type_and_name import VariableTypeAndName diff --git a/seed/sdk/trace/src/seed/resources/problem/types/update_problem_response.py b/seed/sdk/trace/src/seed/problem/update_problem_response.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/problem/types/update_problem_response.py rename to seed/sdk/trace/src/seed/problem/update_problem_response.py index 8fd64ed0a..f2c9f8318 100644 --- a/seed/sdk/trace/src/seed/resources/problem/types/update_problem_response.py +++ b/seed/sdk/trace/src/seed/problem/update_problem_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/problem/types/variable_type_and_name.py b/seed/sdk/trace/src/seed/problem/variable_type_and_name.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/problem/types/variable_type_and_name.py rename to seed/sdk/trace/src/seed/problem/variable_type_and_name.py index 1e1027243..ddda90326 100644 --- a/seed/sdk/trace/src/seed/resources/problem/types/variable_type_and_name.py +++ b/seed/sdk/trace/src/seed/problem/variable_type_and_name.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.variable_type import VariableType +from ..commons.variable_type import VariableType +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/__init__.py b/seed/sdk/trace/src/seed/resources/__init__.py deleted file mode 100644 index 5478ae260..000000000 --- a/seed/sdk/trace/src/seed/resources/__init__.py +++ /dev/null @@ -1,494 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import admin, commons, homepage, lang_server, migration, playlist, problem, submission, sysprop, v_2 -from .admin import Test, Test_And, Test_Or -from .commons import ( - BinaryTreeNodeAndTreeValue, - BinaryTreeNodeValue, - BinaryTreeValue, - DebugKeyValuePairs, - DebugMapValue, - DebugVariableValue, - DebugVariableValue_BinaryTreeNodeValue, - DebugVariableValue_BooleanValue, - DebugVariableValue_CharValue, - DebugVariableValue_DoubleValue, - DebugVariableValue_DoublyLinkedListNodeValue, - DebugVariableValue_GenericValue, - DebugVariableValue_IntegerValue, - DebugVariableValue_ListValue, - DebugVariableValue_MapValue, - DebugVariableValue_NullValue, - DebugVariableValue_SinglyLinkedListNodeValue, - DebugVariableValue_StringValue, - DebugVariableValue_UndefinedValue, - DoublyLinkedListNodeAndListValue, - DoublyLinkedListNodeValue, - DoublyLinkedListValue, - FileInfo, - GenericValue, - KeyValuePair, - Language, - ListType, - MapType, - MapValue, - NodeId, - ProblemId, - SinglyLinkedListNodeAndListValue, - SinglyLinkedListNodeValue, - SinglyLinkedListValue, - TestCase, - TestCaseWithExpectedResult, - UserId, - VariableType, - VariableType_BinaryTreeType, - VariableType_BooleanType, - VariableType_CharType, - VariableType_DoubleType, - VariableType_DoublyLinkedListType, - VariableType_IntegerType, - VariableType_ListType, - VariableType_MapType, - VariableType_SinglyLinkedListType, - VariableType_StringType, - VariableValue, - VariableValue_BinaryTreeValue, - VariableValue_BooleanValue, - VariableValue_CharValue, - VariableValue_DoubleValue, - VariableValue_DoublyLinkedListValue, - VariableValue_IntegerValue, - VariableValue_ListValue, - VariableValue_MapValue, - VariableValue_NullValue, - VariableValue_SinglyLinkedListValue, - VariableValue_StringValue, -) -from .lang_server import LangServerRequest, LangServerResponse -from .migration import Migration, MigrationStatus -from .playlist import ( - Playlist, - PlaylistCreateRequest, - PlaylistId, - PlaylistIdNotFoundError, - PlaylistIdNotFoundErrorBody, - PlaylistIdNotFoundErrorBody_PlaylistId, - ReservedKeywordEnum, - UnauthorizedError, - UpdatePlaylistRequest, -) -from .problem import ( - CreateProblemError, - CreateProblemError_Generic, - CreateProblemRequest, - CreateProblemResponse, - CreateProblemResponse_Error, - CreateProblemResponse_Success, - GenericCreateProblemError, - GetDefaultStarterFilesResponse, - ProblemDescription, - ProblemDescriptionBoard, - ProblemDescriptionBoard_Html, - ProblemDescriptionBoard_TestCaseId, - ProblemDescriptionBoard_Variable, - ProblemFiles, - ProblemInfo, - UpdateProblemResponse, - VariableTypeAndName, -) -from .submission import ( - ActualResult, - ActualResult_Exception, - ActualResult_ExceptionV2, - ActualResult_Value, - BuildingExecutorResponse, - CodeExecutionUpdate, - CodeExecutionUpdate_BuildingExecutor, - CodeExecutionUpdate_Errored, - CodeExecutionUpdate_Finished, - CodeExecutionUpdate_Graded, - CodeExecutionUpdate_GradedV2, - CodeExecutionUpdate_InvalidRequest, - CodeExecutionUpdate_Recorded, - CodeExecutionUpdate_Recording, - CodeExecutionUpdate_Running, - CodeExecutionUpdate_Stopped, - CodeExecutionUpdate_WorkspaceRan, - CompileError, - CustomTestCasesUnsupported, - ErrorInfo, - ErrorInfo_CompileError, - ErrorInfo_InternalError, - ErrorInfo_RuntimeError, - ErroredResponse, - ExceptionInfo, - ExceptionV2, - ExceptionV2_Generic, - ExceptionV2_Timeout, - ExecutionSessionResponse, - ExecutionSessionState, - ExecutionSessionStatus, - ExistingSubmissionExecuting, - ExpressionLocation, - FinishedResponse, - GetExecutionSessionStateResponse, - GetSubmissionStateResponse, - GetTraceResponsesPageRequest, - GradedResponse, - GradedResponseV2, - GradedTestCaseUpdate, - InitializeProblemRequest, - InternalError, - InvalidRequestCause, - InvalidRequestCause_CustomTestCasesUnsupported, - InvalidRequestCause_SubmissionIdNotFound, - InvalidRequestCause_UnexpectedLanguage, - InvalidRequestResponse, - LightweightStackframeInformation, - RecordedResponseNotification, - RecordedTestCaseUpdate, - RecordingResponseNotification, - RunningResponse, - RunningSubmissionState, - RuntimeError, - Scope, - ShareId, - StackFrame, - StackInformation, - StderrResponse, - StdoutResponse, - StopRequest, - StoppedResponse, - SubmissionFileInfo, - SubmissionId, - SubmissionIdNotFound, - SubmissionRequest, - SubmissionRequest_InitializeProblemRequest, - SubmissionRequest_InitializeWorkspaceRequest, - SubmissionRequest_Stop, - SubmissionRequest_SubmitV2, - SubmissionRequest_WorkspaceSubmit, - SubmissionResponse, - SubmissionResponse_CodeExecutionUpdate, - SubmissionResponse_ProblemInitialized, - SubmissionResponse_ServerErrored, - SubmissionResponse_ServerInitialized, - SubmissionResponse_Terminated, - SubmissionResponse_WorkspaceInitialized, - SubmissionStatusForTestCase, - SubmissionStatusForTestCase_Graded, - SubmissionStatusForTestCase_GradedV2, - SubmissionStatusForTestCase_Traced, - SubmissionStatusV2, - SubmissionStatusV2_Test, - SubmissionStatusV2_Workspace, - SubmissionTypeEnum, - SubmissionTypeState, - SubmissionTypeState_Test, - SubmissionTypeState_Workspace, - SubmitRequestV2, - TerminatedResponse, - TestCaseGrade, - TestCaseGrade_Hidden, - TestCaseGrade_NonHidden, - TestCaseHiddenGrade, - TestCaseNonHiddenGrade, - TestCaseResult, - TestCaseResultWithStdout, - TestSubmissionState, - TestSubmissionStatus, - TestSubmissionStatusV2, - TestSubmissionStatus_Errored, - TestSubmissionStatus_Running, - TestSubmissionStatus_Stopped, - TestSubmissionStatus_TestCaseIdToState, - TestSubmissionUpdate, - TestSubmissionUpdateInfo, - TestSubmissionUpdateInfo_Errored, - TestSubmissionUpdateInfo_Finished, - TestSubmissionUpdateInfo_GradedTestCase, - TestSubmissionUpdateInfo_RecordedTestCase, - TestSubmissionUpdateInfo_Running, - TestSubmissionUpdateInfo_Stopped, - TraceResponse, - TraceResponseV2, - TraceResponsesPage, - TraceResponsesPageV2, - TracedFile, - TracedTestCase, - UnexpectedLanguageError, - WorkspaceFiles, - WorkspaceRanResponse, - WorkspaceRunDetails, - WorkspaceStarterFilesResponse, - WorkspaceStarterFilesResponseV2, - WorkspaceSubmissionState, - WorkspaceSubmissionStatus, - WorkspaceSubmissionStatusV2, - WorkspaceSubmissionStatus_Errored, - WorkspaceSubmissionStatus_Ran, - WorkspaceSubmissionStatus_Running, - WorkspaceSubmissionStatus_Stopped, - WorkspaceSubmissionStatus_Traced, - WorkspaceSubmissionUpdate, - WorkspaceSubmissionUpdateInfo, - WorkspaceSubmissionUpdateInfo_Errored, - WorkspaceSubmissionUpdateInfo_Finished, - WorkspaceSubmissionUpdateInfo_Ran, - WorkspaceSubmissionUpdateInfo_Running, - WorkspaceSubmissionUpdateInfo_Stopped, - WorkspaceSubmissionUpdateInfo_Traced, - WorkspaceSubmissionUpdateInfo_TracedV2, - WorkspaceSubmitRequest, - WorkspaceTracedUpdate, -) - -__all__ = [ - "ActualResult", - "ActualResult_Exception", - "ActualResult_ExceptionV2", - "ActualResult_Value", - "BinaryTreeNodeAndTreeValue", - "BinaryTreeNodeValue", - "BinaryTreeValue", - "BuildingExecutorResponse", - "CodeExecutionUpdate", - "CodeExecutionUpdate_BuildingExecutor", - "CodeExecutionUpdate_Errored", - "CodeExecutionUpdate_Finished", - "CodeExecutionUpdate_Graded", - "CodeExecutionUpdate_GradedV2", - "CodeExecutionUpdate_InvalidRequest", - "CodeExecutionUpdate_Recorded", - "CodeExecutionUpdate_Recording", - "CodeExecutionUpdate_Running", - "CodeExecutionUpdate_Stopped", - "CodeExecutionUpdate_WorkspaceRan", - "CompileError", - "CreateProblemError", - "CreateProblemError_Generic", - "CreateProblemRequest", - "CreateProblemResponse", - "CreateProblemResponse_Error", - "CreateProblemResponse_Success", - "CustomTestCasesUnsupported", - "DebugKeyValuePairs", - "DebugMapValue", - "DebugVariableValue", - "DebugVariableValue_BinaryTreeNodeValue", - "DebugVariableValue_BooleanValue", - "DebugVariableValue_CharValue", - "DebugVariableValue_DoubleValue", - "DebugVariableValue_DoublyLinkedListNodeValue", - "DebugVariableValue_GenericValue", - "DebugVariableValue_IntegerValue", - "DebugVariableValue_ListValue", - "DebugVariableValue_MapValue", - "DebugVariableValue_NullValue", - "DebugVariableValue_SinglyLinkedListNodeValue", - "DebugVariableValue_StringValue", - "DebugVariableValue_UndefinedValue", - "DoublyLinkedListNodeAndListValue", - "DoublyLinkedListNodeValue", - "DoublyLinkedListValue", - "ErrorInfo", - "ErrorInfo_CompileError", - "ErrorInfo_InternalError", - "ErrorInfo_RuntimeError", - "ErroredResponse", - "ExceptionInfo", - "ExceptionV2", - "ExceptionV2_Generic", - "ExceptionV2_Timeout", - "ExecutionSessionResponse", - "ExecutionSessionState", - "ExecutionSessionStatus", - "ExistingSubmissionExecuting", - "ExpressionLocation", - "FileInfo", - "FinishedResponse", - "GenericCreateProblemError", - "GenericValue", - "GetDefaultStarterFilesResponse", - "GetExecutionSessionStateResponse", - "GetSubmissionStateResponse", - "GetTraceResponsesPageRequest", - "GradedResponse", - "GradedResponseV2", - "GradedTestCaseUpdate", - "InitializeProblemRequest", - "InternalError", - "InvalidRequestCause", - "InvalidRequestCause_CustomTestCasesUnsupported", - "InvalidRequestCause_SubmissionIdNotFound", - "InvalidRequestCause_UnexpectedLanguage", - "InvalidRequestResponse", - "KeyValuePair", - "LangServerRequest", - "LangServerResponse", - "Language", - "LightweightStackframeInformation", - "ListType", - "MapType", - "MapValue", - "Migration", - "MigrationStatus", - "NodeId", - "Playlist", - "PlaylistCreateRequest", - "PlaylistId", - "PlaylistIdNotFoundError", - "PlaylistIdNotFoundErrorBody", - "PlaylistIdNotFoundErrorBody_PlaylistId", - "ProblemDescription", - "ProblemDescriptionBoard", - "ProblemDescriptionBoard_Html", - "ProblemDescriptionBoard_TestCaseId", - "ProblemDescriptionBoard_Variable", - "ProblemFiles", - "ProblemId", - "ProblemInfo", - "RecordedResponseNotification", - "RecordedTestCaseUpdate", - "RecordingResponseNotification", - "ReservedKeywordEnum", - "RunningResponse", - "RunningSubmissionState", - "RuntimeError", - "Scope", - "ShareId", - "SinglyLinkedListNodeAndListValue", - "SinglyLinkedListNodeValue", - "SinglyLinkedListValue", - "StackFrame", - "StackInformation", - "StderrResponse", - "StdoutResponse", - "StopRequest", - "StoppedResponse", - "SubmissionFileInfo", - "SubmissionId", - "SubmissionIdNotFound", - "SubmissionRequest", - "SubmissionRequest_InitializeProblemRequest", - "SubmissionRequest_InitializeWorkspaceRequest", - "SubmissionRequest_Stop", - "SubmissionRequest_SubmitV2", - "SubmissionRequest_WorkspaceSubmit", - "SubmissionResponse", - "SubmissionResponse_CodeExecutionUpdate", - "SubmissionResponse_ProblemInitialized", - "SubmissionResponse_ServerErrored", - "SubmissionResponse_ServerInitialized", - "SubmissionResponse_Terminated", - "SubmissionResponse_WorkspaceInitialized", - "SubmissionStatusForTestCase", - "SubmissionStatusForTestCase_Graded", - "SubmissionStatusForTestCase_GradedV2", - "SubmissionStatusForTestCase_Traced", - "SubmissionStatusV2", - "SubmissionStatusV2_Test", - "SubmissionStatusV2_Workspace", - "SubmissionTypeEnum", - "SubmissionTypeState", - "SubmissionTypeState_Test", - "SubmissionTypeState_Workspace", - "SubmitRequestV2", - "TerminatedResponse", - "Test", - "TestCase", - "TestCaseGrade", - "TestCaseGrade_Hidden", - "TestCaseGrade_NonHidden", - "TestCaseHiddenGrade", - "TestCaseNonHiddenGrade", - "TestCaseResult", - "TestCaseResultWithStdout", - "TestCaseWithExpectedResult", - "TestSubmissionState", - "TestSubmissionStatus", - "TestSubmissionStatusV2", - "TestSubmissionStatus_Errored", - "TestSubmissionStatus_Running", - "TestSubmissionStatus_Stopped", - "TestSubmissionStatus_TestCaseIdToState", - "TestSubmissionUpdate", - "TestSubmissionUpdateInfo", - "TestSubmissionUpdateInfo_Errored", - "TestSubmissionUpdateInfo_Finished", - "TestSubmissionUpdateInfo_GradedTestCase", - "TestSubmissionUpdateInfo_RecordedTestCase", - "TestSubmissionUpdateInfo_Running", - "TestSubmissionUpdateInfo_Stopped", - "Test_And", - "Test_Or", - "TraceResponse", - "TraceResponseV2", - "TraceResponsesPage", - "TraceResponsesPageV2", - "TracedFile", - "TracedTestCase", - "UnauthorizedError", - "UnexpectedLanguageError", - "UpdatePlaylistRequest", - "UpdateProblemResponse", - "UserId", - "VariableType", - "VariableTypeAndName", - "VariableType_BinaryTreeType", - "VariableType_BooleanType", - "VariableType_CharType", - "VariableType_DoubleType", - "VariableType_DoublyLinkedListType", - "VariableType_IntegerType", - "VariableType_ListType", - "VariableType_MapType", - "VariableType_SinglyLinkedListType", - "VariableType_StringType", - "VariableValue", - "VariableValue_BinaryTreeValue", - "VariableValue_BooleanValue", - "VariableValue_CharValue", - "VariableValue_DoubleValue", - "VariableValue_DoublyLinkedListValue", - "VariableValue_IntegerValue", - "VariableValue_ListValue", - "VariableValue_MapValue", - "VariableValue_NullValue", - "VariableValue_SinglyLinkedListValue", - "VariableValue_StringValue", - "WorkspaceFiles", - "WorkspaceRanResponse", - "WorkspaceRunDetails", - "WorkspaceStarterFilesResponse", - "WorkspaceStarterFilesResponseV2", - "WorkspaceSubmissionState", - "WorkspaceSubmissionStatus", - "WorkspaceSubmissionStatusV2", - "WorkspaceSubmissionStatus_Errored", - "WorkspaceSubmissionStatus_Ran", - "WorkspaceSubmissionStatus_Running", - "WorkspaceSubmissionStatus_Stopped", - "WorkspaceSubmissionStatus_Traced", - "WorkspaceSubmissionUpdate", - "WorkspaceSubmissionUpdateInfo", - "WorkspaceSubmissionUpdateInfo_Errored", - "WorkspaceSubmissionUpdateInfo_Finished", - "WorkspaceSubmissionUpdateInfo_Ran", - "WorkspaceSubmissionUpdateInfo_Running", - "WorkspaceSubmissionUpdateInfo_Stopped", - "WorkspaceSubmissionUpdateInfo_Traced", - "WorkspaceSubmissionUpdateInfo_TracedV2", - "WorkspaceSubmitRequest", - "WorkspaceTracedUpdate", - "admin", - "commons", - "homepage", - "lang_server", - "migration", - "playlist", - "problem", - "submission", - "sysprop", - "v_2", -] diff --git a/seed/sdk/trace/src/seed/resources/admin/__init__.py b/seed/sdk/trace/src/seed/resources/admin/__init__.py deleted file mode 100644 index 92e7a77ca..000000000 --- a/seed/sdk/trace/src/seed/resources/admin/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Test, Test_And, Test_Or - -__all__ = ["Test", "Test_And", "Test_Or"] diff --git a/seed/sdk/trace/src/seed/resources/commons/__init__.py b/seed/sdk/trace/src/seed/resources/commons/__init__.py deleted file mode 100644 index c97a9c1a0..000000000 --- a/seed/sdk/trace/src/seed/resources/commons/__init__.py +++ /dev/null @@ -1,127 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - BinaryTreeNodeAndTreeValue, - BinaryTreeNodeValue, - BinaryTreeValue, - DebugKeyValuePairs, - DebugMapValue, - DebugVariableValue, - DebugVariableValue_BinaryTreeNodeValue, - DebugVariableValue_BooleanValue, - DebugVariableValue_CharValue, - DebugVariableValue_DoubleValue, - DebugVariableValue_DoublyLinkedListNodeValue, - DebugVariableValue_GenericValue, - DebugVariableValue_IntegerValue, - DebugVariableValue_ListValue, - DebugVariableValue_MapValue, - DebugVariableValue_NullValue, - DebugVariableValue_SinglyLinkedListNodeValue, - DebugVariableValue_StringValue, - DebugVariableValue_UndefinedValue, - DoublyLinkedListNodeAndListValue, - DoublyLinkedListNodeValue, - DoublyLinkedListValue, - FileInfo, - GenericValue, - KeyValuePair, - Language, - ListType, - MapType, - MapValue, - NodeId, - ProblemId, - SinglyLinkedListNodeAndListValue, - SinglyLinkedListNodeValue, - SinglyLinkedListValue, - TestCase, - TestCaseWithExpectedResult, - UserId, - VariableType, - VariableType_BinaryTreeType, - VariableType_BooleanType, - VariableType_CharType, - VariableType_DoubleType, - VariableType_DoublyLinkedListType, - VariableType_IntegerType, - VariableType_ListType, - VariableType_MapType, - VariableType_SinglyLinkedListType, - VariableType_StringType, - VariableValue, - VariableValue_BinaryTreeValue, - VariableValue_BooleanValue, - VariableValue_CharValue, - VariableValue_DoubleValue, - VariableValue_DoublyLinkedListValue, - VariableValue_IntegerValue, - VariableValue_ListValue, - VariableValue_MapValue, - VariableValue_NullValue, - VariableValue_SinglyLinkedListValue, - VariableValue_StringValue, -) - -__all__ = [ - "BinaryTreeNodeAndTreeValue", - "BinaryTreeNodeValue", - "BinaryTreeValue", - "DebugKeyValuePairs", - "DebugMapValue", - "DebugVariableValue", - "DebugVariableValue_BinaryTreeNodeValue", - "DebugVariableValue_BooleanValue", - "DebugVariableValue_CharValue", - "DebugVariableValue_DoubleValue", - "DebugVariableValue_DoublyLinkedListNodeValue", - "DebugVariableValue_GenericValue", - "DebugVariableValue_IntegerValue", - "DebugVariableValue_ListValue", - "DebugVariableValue_MapValue", - "DebugVariableValue_NullValue", - "DebugVariableValue_SinglyLinkedListNodeValue", - "DebugVariableValue_StringValue", - "DebugVariableValue_UndefinedValue", - "DoublyLinkedListNodeAndListValue", - "DoublyLinkedListNodeValue", - "DoublyLinkedListValue", - "FileInfo", - "GenericValue", - "KeyValuePair", - "Language", - "ListType", - "MapType", - "MapValue", - "NodeId", - "ProblemId", - "SinglyLinkedListNodeAndListValue", - "SinglyLinkedListNodeValue", - "SinglyLinkedListValue", - "TestCase", - "TestCaseWithExpectedResult", - "UserId", - "VariableType", - "VariableType_BinaryTreeType", - "VariableType_BooleanType", - "VariableType_CharType", - "VariableType_DoubleType", - "VariableType_DoublyLinkedListType", - "VariableType_IntegerType", - "VariableType_ListType", - "VariableType_MapType", - "VariableType_SinglyLinkedListType", - "VariableType_StringType", - "VariableValue", - "VariableValue_BinaryTreeValue", - "VariableValue_BooleanValue", - "VariableValue_CharValue", - "VariableValue_DoubleValue", - "VariableValue_DoublyLinkedListValue", - "VariableValue_IntegerValue", - "VariableValue_ListValue", - "VariableValue_MapValue", - "VariableValue_NullValue", - "VariableValue_SinglyLinkedListValue", - "VariableValue_StringValue", -] diff --git a/seed/sdk/trace/src/seed/resources/lang_server/__init__.py b/seed/sdk/trace/src/seed/resources/lang_server/__init__.py deleted file mode 100644 index 8cecdb9f6..000000000 --- a/seed/sdk/trace/src/seed/resources/lang_server/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import LangServerRequest, LangServerResponse - -__all__ = ["LangServerRequest", "LangServerResponse"] diff --git a/seed/sdk/trace/src/seed/resources/migration/__init__.py b/seed/sdk/trace/src/seed/resources/migration/__init__.py deleted file mode 100644 index 91f8d2420..000000000 --- a/seed/sdk/trace/src/seed/resources/migration/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import Migration, MigrationStatus - -__all__ = ["Migration", "MigrationStatus"] diff --git a/seed/sdk/trace/src/seed/resources/playlist/__init__.py b/seed/sdk/trace/src/seed/resources/playlist/__init__.py deleted file mode 100644 index ac403d0d9..000000000 --- a/seed/sdk/trace/src/seed/resources/playlist/__init__.py +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - Playlist, - PlaylistCreateRequest, - PlaylistId, - PlaylistIdNotFoundErrorBody, - PlaylistIdNotFoundErrorBody_PlaylistId, - ReservedKeywordEnum, - UpdatePlaylistRequest, -) -from .errors import PlaylistIdNotFoundError, UnauthorizedError - -__all__ = [ - "Playlist", - "PlaylistCreateRequest", - "PlaylistId", - "PlaylistIdNotFoundError", - "PlaylistIdNotFoundErrorBody", - "PlaylistIdNotFoundErrorBody_PlaylistId", - "ReservedKeywordEnum", - "UnauthorizedError", - "UpdatePlaylistRequest", -] diff --git a/seed/sdk/trace/src/seed/resources/playlist/errors/__init__.py b/seed/sdk/trace/src/seed/resources/playlist/errors/__init__.py deleted file mode 100644 index 4bb64bf42..000000000 --- a/seed/sdk/trace/src/seed/resources/playlist/errors/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .playlist_id_not_found_error import PlaylistIdNotFoundError -from .unauthorized_error import UnauthorizedError - -__all__ = ["PlaylistIdNotFoundError", "UnauthorizedError"] diff --git a/seed/sdk/trace/src/seed/resources/problem/__init__.py b/seed/sdk/trace/src/seed/resources/problem/__init__.py deleted file mode 100644 index d3f6db9d7..000000000 --- a/seed/sdk/trace/src/seed/resources/problem/__init__.py +++ /dev/null @@ -1,41 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - CreateProblemError, - CreateProblemError_Generic, - CreateProblemRequest, - CreateProblemResponse, - CreateProblemResponse_Error, - CreateProblemResponse_Success, - GenericCreateProblemError, - GetDefaultStarterFilesResponse, - ProblemDescription, - ProblemDescriptionBoard, - ProblemDescriptionBoard_Html, - ProblemDescriptionBoard_TestCaseId, - ProblemDescriptionBoard_Variable, - ProblemFiles, - ProblemInfo, - UpdateProblemResponse, - VariableTypeAndName, -) - -__all__ = [ - "CreateProblemError", - "CreateProblemError_Generic", - "CreateProblemRequest", - "CreateProblemResponse", - "CreateProblemResponse_Error", - "CreateProblemResponse_Success", - "GenericCreateProblemError", - "GetDefaultStarterFilesResponse", - "ProblemDescription", - "ProblemDescriptionBoard", - "ProblemDescriptionBoard_Html", - "ProblemDescriptionBoard_TestCaseId", - "ProblemDescriptionBoard_Variable", - "ProblemFiles", - "ProblemInfo", - "UpdateProblemResponse", - "VariableTypeAndName", -] diff --git a/seed/sdk/trace/src/seed/resources/submission/__init__.py b/seed/sdk/trace/src/seed/resources/submission/__init__.py deleted file mode 100644 index 3d94a87fa..000000000 --- a/seed/sdk/trace/src/seed/resources/submission/__init__.py +++ /dev/null @@ -1,295 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - ActualResult, - ActualResult_Exception, - ActualResult_ExceptionV2, - ActualResult_Value, - BuildingExecutorResponse, - CodeExecutionUpdate, - CodeExecutionUpdate_BuildingExecutor, - CodeExecutionUpdate_Errored, - CodeExecutionUpdate_Finished, - CodeExecutionUpdate_Graded, - CodeExecutionUpdate_GradedV2, - CodeExecutionUpdate_InvalidRequest, - CodeExecutionUpdate_Recorded, - CodeExecutionUpdate_Recording, - CodeExecutionUpdate_Running, - CodeExecutionUpdate_Stopped, - CodeExecutionUpdate_WorkspaceRan, - CompileError, - CustomTestCasesUnsupported, - ErrorInfo, - ErrorInfo_CompileError, - ErrorInfo_InternalError, - ErrorInfo_RuntimeError, - ErroredResponse, - ExceptionInfo, - ExceptionV2, - ExceptionV2_Generic, - ExceptionV2_Timeout, - ExecutionSessionResponse, - ExecutionSessionState, - ExecutionSessionStatus, - ExistingSubmissionExecuting, - ExpressionLocation, - FinishedResponse, - GetExecutionSessionStateResponse, - GetSubmissionStateResponse, - GetTraceResponsesPageRequest, - GradedResponse, - GradedResponseV2, - GradedTestCaseUpdate, - InitializeProblemRequest, - InternalError, - InvalidRequestCause, - InvalidRequestCause_CustomTestCasesUnsupported, - InvalidRequestCause_SubmissionIdNotFound, - InvalidRequestCause_UnexpectedLanguage, - InvalidRequestResponse, - LightweightStackframeInformation, - RecordedResponseNotification, - RecordedTestCaseUpdate, - RecordingResponseNotification, - RunningResponse, - RunningSubmissionState, - RuntimeError, - Scope, - ShareId, - StackFrame, - StackInformation, - StderrResponse, - StdoutResponse, - StopRequest, - StoppedResponse, - SubmissionFileInfo, - SubmissionId, - SubmissionIdNotFound, - SubmissionRequest, - SubmissionRequest_InitializeProblemRequest, - SubmissionRequest_InitializeWorkspaceRequest, - SubmissionRequest_Stop, - SubmissionRequest_SubmitV2, - SubmissionRequest_WorkspaceSubmit, - SubmissionResponse, - SubmissionResponse_CodeExecutionUpdate, - SubmissionResponse_ProblemInitialized, - SubmissionResponse_ServerErrored, - SubmissionResponse_ServerInitialized, - SubmissionResponse_Terminated, - SubmissionResponse_WorkspaceInitialized, - SubmissionStatusForTestCase, - SubmissionStatusForTestCase_Graded, - SubmissionStatusForTestCase_GradedV2, - SubmissionStatusForTestCase_Traced, - SubmissionStatusV2, - SubmissionStatusV2_Test, - SubmissionStatusV2_Workspace, - SubmissionTypeEnum, - SubmissionTypeState, - SubmissionTypeState_Test, - SubmissionTypeState_Workspace, - SubmitRequestV2, - TerminatedResponse, - TestCaseGrade, - TestCaseGrade_Hidden, - TestCaseGrade_NonHidden, - TestCaseHiddenGrade, - TestCaseNonHiddenGrade, - TestCaseResult, - TestCaseResultWithStdout, - TestSubmissionState, - TestSubmissionStatus, - TestSubmissionStatusV2, - TestSubmissionStatus_Errored, - TestSubmissionStatus_Running, - TestSubmissionStatus_Stopped, - TestSubmissionStatus_TestCaseIdToState, - TestSubmissionUpdate, - TestSubmissionUpdateInfo, - TestSubmissionUpdateInfo_Errored, - TestSubmissionUpdateInfo_Finished, - TestSubmissionUpdateInfo_GradedTestCase, - TestSubmissionUpdateInfo_RecordedTestCase, - TestSubmissionUpdateInfo_Running, - TestSubmissionUpdateInfo_Stopped, - TraceResponse, - TraceResponseV2, - TraceResponsesPage, - TraceResponsesPageV2, - TracedFile, - TracedTestCase, - UnexpectedLanguageError, - WorkspaceFiles, - WorkspaceRanResponse, - WorkspaceRunDetails, - WorkspaceStarterFilesResponse, - WorkspaceStarterFilesResponseV2, - WorkspaceSubmissionState, - WorkspaceSubmissionStatus, - WorkspaceSubmissionStatusV2, - WorkspaceSubmissionStatus_Errored, - WorkspaceSubmissionStatus_Ran, - WorkspaceSubmissionStatus_Running, - WorkspaceSubmissionStatus_Stopped, - WorkspaceSubmissionStatus_Traced, - WorkspaceSubmissionUpdate, - WorkspaceSubmissionUpdateInfo, - WorkspaceSubmissionUpdateInfo_Errored, - WorkspaceSubmissionUpdateInfo_Finished, - WorkspaceSubmissionUpdateInfo_Ran, - WorkspaceSubmissionUpdateInfo_Running, - WorkspaceSubmissionUpdateInfo_Stopped, - WorkspaceSubmissionUpdateInfo_Traced, - WorkspaceSubmissionUpdateInfo_TracedV2, - WorkspaceSubmitRequest, - WorkspaceTracedUpdate, -) - -__all__ = [ - "ActualResult", - "ActualResult_Exception", - "ActualResult_ExceptionV2", - "ActualResult_Value", - "BuildingExecutorResponse", - "CodeExecutionUpdate", - "CodeExecutionUpdate_BuildingExecutor", - "CodeExecutionUpdate_Errored", - "CodeExecutionUpdate_Finished", - "CodeExecutionUpdate_Graded", - "CodeExecutionUpdate_GradedV2", - "CodeExecutionUpdate_InvalidRequest", - "CodeExecutionUpdate_Recorded", - "CodeExecutionUpdate_Recording", - "CodeExecutionUpdate_Running", - "CodeExecutionUpdate_Stopped", - "CodeExecutionUpdate_WorkspaceRan", - "CompileError", - "CustomTestCasesUnsupported", - "ErrorInfo", - "ErrorInfo_CompileError", - "ErrorInfo_InternalError", - "ErrorInfo_RuntimeError", - "ErroredResponse", - "ExceptionInfo", - "ExceptionV2", - "ExceptionV2_Generic", - "ExceptionV2_Timeout", - "ExecutionSessionResponse", - "ExecutionSessionState", - "ExecutionSessionStatus", - "ExistingSubmissionExecuting", - "ExpressionLocation", - "FinishedResponse", - "GetExecutionSessionStateResponse", - "GetSubmissionStateResponse", - "GetTraceResponsesPageRequest", - "GradedResponse", - "GradedResponseV2", - "GradedTestCaseUpdate", - "InitializeProblemRequest", - "InternalError", - "InvalidRequestCause", - "InvalidRequestCause_CustomTestCasesUnsupported", - "InvalidRequestCause_SubmissionIdNotFound", - "InvalidRequestCause_UnexpectedLanguage", - "InvalidRequestResponse", - "LightweightStackframeInformation", - "RecordedResponseNotification", - "RecordedTestCaseUpdate", - "RecordingResponseNotification", - "RunningResponse", - "RunningSubmissionState", - "RuntimeError", - "Scope", - "ShareId", - "StackFrame", - "StackInformation", - "StderrResponse", - "StdoutResponse", - "StopRequest", - "StoppedResponse", - "SubmissionFileInfo", - "SubmissionId", - "SubmissionIdNotFound", - "SubmissionRequest", - "SubmissionRequest_InitializeProblemRequest", - "SubmissionRequest_InitializeWorkspaceRequest", - "SubmissionRequest_Stop", - "SubmissionRequest_SubmitV2", - "SubmissionRequest_WorkspaceSubmit", - "SubmissionResponse", - "SubmissionResponse_CodeExecutionUpdate", - "SubmissionResponse_ProblemInitialized", - "SubmissionResponse_ServerErrored", - "SubmissionResponse_ServerInitialized", - "SubmissionResponse_Terminated", - "SubmissionResponse_WorkspaceInitialized", - "SubmissionStatusForTestCase", - "SubmissionStatusForTestCase_Graded", - "SubmissionStatusForTestCase_GradedV2", - "SubmissionStatusForTestCase_Traced", - "SubmissionStatusV2", - "SubmissionStatusV2_Test", - "SubmissionStatusV2_Workspace", - "SubmissionTypeEnum", - "SubmissionTypeState", - "SubmissionTypeState_Test", - "SubmissionTypeState_Workspace", - "SubmitRequestV2", - "TerminatedResponse", - "TestCaseGrade", - "TestCaseGrade_Hidden", - "TestCaseGrade_NonHidden", - "TestCaseHiddenGrade", - "TestCaseNonHiddenGrade", - "TestCaseResult", - "TestCaseResultWithStdout", - "TestSubmissionState", - "TestSubmissionStatus", - "TestSubmissionStatusV2", - "TestSubmissionStatus_Errored", - "TestSubmissionStatus_Running", - "TestSubmissionStatus_Stopped", - "TestSubmissionStatus_TestCaseIdToState", - "TestSubmissionUpdate", - "TestSubmissionUpdateInfo", - "TestSubmissionUpdateInfo_Errored", - "TestSubmissionUpdateInfo_Finished", - "TestSubmissionUpdateInfo_GradedTestCase", - "TestSubmissionUpdateInfo_RecordedTestCase", - "TestSubmissionUpdateInfo_Running", - "TestSubmissionUpdateInfo_Stopped", - "TraceResponse", - "TraceResponseV2", - "TraceResponsesPage", - "TraceResponsesPageV2", - "TracedFile", - "TracedTestCase", - "UnexpectedLanguageError", - "WorkspaceFiles", - "WorkspaceRanResponse", - "WorkspaceRunDetails", - "WorkspaceStarterFilesResponse", - "WorkspaceStarterFilesResponseV2", - "WorkspaceSubmissionState", - "WorkspaceSubmissionStatus", - "WorkspaceSubmissionStatusV2", - "WorkspaceSubmissionStatus_Errored", - "WorkspaceSubmissionStatus_Ran", - "WorkspaceSubmissionStatus_Running", - "WorkspaceSubmissionStatus_Stopped", - "WorkspaceSubmissionStatus_Traced", - "WorkspaceSubmissionUpdate", - "WorkspaceSubmissionUpdateInfo", - "WorkspaceSubmissionUpdateInfo_Errored", - "WorkspaceSubmissionUpdateInfo_Finished", - "WorkspaceSubmissionUpdateInfo_Ran", - "WorkspaceSubmissionUpdateInfo_Running", - "WorkspaceSubmissionUpdateInfo_Stopped", - "WorkspaceSubmissionUpdateInfo_Traced", - "WorkspaceSubmissionUpdateInfo_TracedV2", - "WorkspaceSubmitRequest", - "WorkspaceTracedUpdate", -] diff --git a/seed/sdk/trace/src/seed/resources/v_2/__init__.py b/seed/sdk/trace/src/seed/resources/v_2/__init__.py deleted file mode 100644 index ebcf53700..000000000 --- a/seed/sdk/trace/src/seed/resources/v_2/__init__.py +++ /dev/null @@ -1,119 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import ( - AssertCorrectnessCheck, - AssertCorrectnessCheck_Custom, - AssertCorrectnessCheck_DeepEquality, - BasicCustomFiles, - BasicTestCaseTemplate, - CreateProblemRequestV2, - CustomFiles, - CustomFiles_Basic, - CustomFiles_Custom, - DeepEqualityCorrectnessCheck, - DefaultProvidedFile, - FileInfoV2, - Files, - FunctionImplementation, - FunctionImplementationForMultipleLanguages, - FunctionSignature, - FunctionSignature_NonVoid, - FunctionSignature_Void, - FunctionSignature_VoidThatTakesActualResult, - GeneratedFiles, - GetBasicSolutionFileRequest, - GetBasicSolutionFileResponse, - GetFunctionSignatureRequest, - GetFunctionSignatureResponse, - GetGeneratedTestCaseFileRequest, - GetGeneratedTestCaseTemplateFileRequest, - LightweightProblemInfoV2, - NonVoidFunctionDefinition, - NonVoidFunctionSignature, - Parameter, - ParameterId, - ProblemInfoV2, - TestCaseExpects, - TestCaseFunction, - TestCaseFunction_Custom, - TestCaseFunction_WithActualResult, - TestCaseId, - TestCaseImplementation, - TestCaseImplementationDescription, - TestCaseImplementationDescriptionBoard, - TestCaseImplementationDescriptionBoard_Html, - TestCaseImplementationDescriptionBoard_ParamId, - TestCaseImplementationReference, - TestCaseImplementationReference_Implementation, - TestCaseImplementationReference_TemplateId, - TestCaseMetadata, - TestCaseTemplate, - TestCaseTemplateId, - TestCaseV2, - TestCaseWithActualResultImplementation, - VoidFunctionDefinition, - VoidFunctionDefinitionThatTakesActualResult, - VoidFunctionSignature, - VoidFunctionSignatureThatTakesActualResult, - problem, - v_3, -) - -__all__ = [ - "AssertCorrectnessCheck", - "AssertCorrectnessCheck_Custom", - "AssertCorrectnessCheck_DeepEquality", - "BasicCustomFiles", - "BasicTestCaseTemplate", - "CreateProblemRequestV2", - "CustomFiles", - "CustomFiles_Basic", - "CustomFiles_Custom", - "DeepEqualityCorrectnessCheck", - "DefaultProvidedFile", - "FileInfoV2", - "Files", - "FunctionImplementation", - "FunctionImplementationForMultipleLanguages", - "FunctionSignature", - "FunctionSignature_NonVoid", - "FunctionSignature_Void", - "FunctionSignature_VoidThatTakesActualResult", - "GeneratedFiles", - "GetBasicSolutionFileRequest", - "GetBasicSolutionFileResponse", - "GetFunctionSignatureRequest", - "GetFunctionSignatureResponse", - "GetGeneratedTestCaseFileRequest", - "GetGeneratedTestCaseTemplateFileRequest", - "LightweightProblemInfoV2", - "NonVoidFunctionDefinition", - "NonVoidFunctionSignature", - "Parameter", - "ParameterId", - "ProblemInfoV2", - "TestCaseExpects", - "TestCaseFunction", - "TestCaseFunction_Custom", - "TestCaseFunction_WithActualResult", - "TestCaseId", - "TestCaseImplementation", - "TestCaseImplementationDescription", - "TestCaseImplementationDescriptionBoard", - "TestCaseImplementationDescriptionBoard_Html", - "TestCaseImplementationDescriptionBoard_ParamId", - "TestCaseImplementationReference", - "TestCaseImplementationReference_Implementation", - "TestCaseImplementationReference_TemplateId", - "TestCaseMetadata", - "TestCaseTemplate", - "TestCaseTemplateId", - "TestCaseV2", - "TestCaseWithActualResultImplementation", - "VoidFunctionDefinition", - "VoidFunctionDefinitionThatTakesActualResult", - "VoidFunctionSignature", - "VoidFunctionSignatureThatTakesActualResult", - "problem", - "v_3", -] diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/__init__.py b/seed/sdk/trace/src/seed/resources/v_2/resources/problem/__init__.py deleted file mode 100644 index eaf98765a..000000000 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/__init__.py +++ /dev/null @@ -1,115 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - AssertCorrectnessCheck, - AssertCorrectnessCheck_Custom, - AssertCorrectnessCheck_DeepEquality, - BasicCustomFiles, - BasicTestCaseTemplate, - CreateProblemRequestV2, - CustomFiles, - CustomFiles_Basic, - CustomFiles_Custom, - DeepEqualityCorrectnessCheck, - DefaultProvidedFile, - FileInfoV2, - Files, - FunctionImplementation, - FunctionImplementationForMultipleLanguages, - FunctionSignature, - FunctionSignature_NonVoid, - FunctionSignature_Void, - FunctionSignature_VoidThatTakesActualResult, - GeneratedFiles, - GetBasicSolutionFileRequest, - GetBasicSolutionFileResponse, - GetFunctionSignatureRequest, - GetFunctionSignatureResponse, - GetGeneratedTestCaseFileRequest, - GetGeneratedTestCaseTemplateFileRequest, - LightweightProblemInfoV2, - NonVoidFunctionDefinition, - NonVoidFunctionSignature, - Parameter, - ParameterId, - ProblemInfoV2, - TestCaseExpects, - TestCaseFunction, - TestCaseFunction_Custom, - TestCaseFunction_WithActualResult, - TestCaseId, - TestCaseImplementation, - TestCaseImplementationDescription, - TestCaseImplementationDescriptionBoard, - TestCaseImplementationDescriptionBoard_Html, - TestCaseImplementationDescriptionBoard_ParamId, - TestCaseImplementationReference, - TestCaseImplementationReference_Implementation, - TestCaseImplementationReference_TemplateId, - TestCaseMetadata, - TestCaseTemplate, - TestCaseTemplateId, - TestCaseV2, - TestCaseWithActualResultImplementation, - VoidFunctionDefinition, - VoidFunctionDefinitionThatTakesActualResult, - VoidFunctionSignature, - VoidFunctionSignatureThatTakesActualResult, -) - -__all__ = [ - "AssertCorrectnessCheck", - "AssertCorrectnessCheck_Custom", - "AssertCorrectnessCheck_DeepEquality", - "BasicCustomFiles", - "BasicTestCaseTemplate", - "CreateProblemRequestV2", - "CustomFiles", - "CustomFiles_Basic", - "CustomFiles_Custom", - "DeepEqualityCorrectnessCheck", - "DefaultProvidedFile", - "FileInfoV2", - "Files", - "FunctionImplementation", - "FunctionImplementationForMultipleLanguages", - "FunctionSignature", - "FunctionSignature_NonVoid", - "FunctionSignature_Void", - "FunctionSignature_VoidThatTakesActualResult", - "GeneratedFiles", - "GetBasicSolutionFileRequest", - "GetBasicSolutionFileResponse", - "GetFunctionSignatureRequest", - "GetFunctionSignatureResponse", - "GetGeneratedTestCaseFileRequest", - "GetGeneratedTestCaseTemplateFileRequest", - "LightweightProblemInfoV2", - "NonVoidFunctionDefinition", - "NonVoidFunctionSignature", - "Parameter", - "ParameterId", - "ProblemInfoV2", - "TestCaseExpects", - "TestCaseFunction", - "TestCaseFunction_Custom", - "TestCaseFunction_WithActualResult", - "TestCaseId", - "TestCaseImplementation", - "TestCaseImplementationDescription", - "TestCaseImplementationDescriptionBoard", - "TestCaseImplementationDescriptionBoard_Html", - "TestCaseImplementationDescriptionBoard_ParamId", - "TestCaseImplementationReference", - "TestCaseImplementationReference_Implementation", - "TestCaseImplementationReference_TemplateId", - "TestCaseMetadata", - "TestCaseTemplate", - "TestCaseTemplateId", - "TestCaseV2", - "TestCaseWithActualResultImplementation", - "VoidFunctionDefinition", - "VoidFunctionDefinitionThatTakesActualResult", - "VoidFunctionSignature", - "VoidFunctionSignatureThatTakesActualResult", -] diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/__init__.py b/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/__init__.py deleted file mode 100644 index e9e92c59e..000000000 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/__init__.py +++ /dev/null @@ -1,117 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .resources import ( - AssertCorrectnessCheck, - AssertCorrectnessCheck_Custom, - AssertCorrectnessCheck_DeepEquality, - BasicCustomFiles, - BasicTestCaseTemplate, - CreateProblemRequestV2, - CustomFiles, - CustomFiles_Basic, - CustomFiles_Custom, - DeepEqualityCorrectnessCheck, - DefaultProvidedFile, - FileInfoV2, - Files, - FunctionImplementation, - FunctionImplementationForMultipleLanguages, - FunctionSignature, - FunctionSignature_NonVoid, - FunctionSignature_Void, - FunctionSignature_VoidThatTakesActualResult, - GeneratedFiles, - GetBasicSolutionFileRequest, - GetBasicSolutionFileResponse, - GetFunctionSignatureRequest, - GetFunctionSignatureResponse, - GetGeneratedTestCaseFileRequest, - GetGeneratedTestCaseTemplateFileRequest, - LightweightProblemInfoV2, - NonVoidFunctionDefinition, - NonVoidFunctionSignature, - Parameter, - ParameterId, - ProblemInfoV2, - TestCaseExpects, - TestCaseFunction, - TestCaseFunction_Custom, - TestCaseFunction_WithActualResult, - TestCaseId, - TestCaseImplementation, - TestCaseImplementationDescription, - TestCaseImplementationDescriptionBoard, - TestCaseImplementationDescriptionBoard_Html, - TestCaseImplementationDescriptionBoard_ParamId, - TestCaseImplementationReference, - TestCaseImplementationReference_Implementation, - TestCaseImplementationReference_TemplateId, - TestCaseMetadata, - TestCaseTemplate, - TestCaseTemplateId, - TestCaseV2, - TestCaseWithActualResultImplementation, - VoidFunctionDefinition, - VoidFunctionDefinitionThatTakesActualResult, - VoidFunctionSignature, - VoidFunctionSignatureThatTakesActualResult, - problem, -) - -__all__ = [ - "AssertCorrectnessCheck", - "AssertCorrectnessCheck_Custom", - "AssertCorrectnessCheck_DeepEquality", - "BasicCustomFiles", - "BasicTestCaseTemplate", - "CreateProblemRequestV2", - "CustomFiles", - "CustomFiles_Basic", - "CustomFiles_Custom", - "DeepEqualityCorrectnessCheck", - "DefaultProvidedFile", - "FileInfoV2", - "Files", - "FunctionImplementation", - "FunctionImplementationForMultipleLanguages", - "FunctionSignature", - "FunctionSignature_NonVoid", - "FunctionSignature_Void", - "FunctionSignature_VoidThatTakesActualResult", - "GeneratedFiles", - "GetBasicSolutionFileRequest", - "GetBasicSolutionFileResponse", - "GetFunctionSignatureRequest", - "GetFunctionSignatureResponse", - "GetGeneratedTestCaseFileRequest", - "GetGeneratedTestCaseTemplateFileRequest", - "LightweightProblemInfoV2", - "NonVoidFunctionDefinition", - "NonVoidFunctionSignature", - "Parameter", - "ParameterId", - "ProblemInfoV2", - "TestCaseExpects", - "TestCaseFunction", - "TestCaseFunction_Custom", - "TestCaseFunction_WithActualResult", - "TestCaseId", - "TestCaseImplementation", - "TestCaseImplementationDescription", - "TestCaseImplementationDescriptionBoard", - "TestCaseImplementationDescriptionBoard_Html", - "TestCaseImplementationDescriptionBoard_ParamId", - "TestCaseImplementationReference", - "TestCaseImplementationReference_Implementation", - "TestCaseImplementationReference_TemplateId", - "TestCaseMetadata", - "TestCaseTemplate", - "TestCaseTemplateId", - "TestCaseV2", - "TestCaseWithActualResultImplementation", - "VoidFunctionDefinition", - "VoidFunctionDefinitionThatTakesActualResult", - "VoidFunctionSignature", - "VoidFunctionSignatureThatTakesActualResult", - "problem", -] diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/__init__.py b/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/__init__.py deleted file mode 100644 index eaf98765a..000000000 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/__init__.py +++ /dev/null @@ -1,115 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import ( - AssertCorrectnessCheck, - AssertCorrectnessCheck_Custom, - AssertCorrectnessCheck_DeepEquality, - BasicCustomFiles, - BasicTestCaseTemplate, - CreateProblemRequestV2, - CustomFiles, - CustomFiles_Basic, - CustomFiles_Custom, - DeepEqualityCorrectnessCheck, - DefaultProvidedFile, - FileInfoV2, - Files, - FunctionImplementation, - FunctionImplementationForMultipleLanguages, - FunctionSignature, - FunctionSignature_NonVoid, - FunctionSignature_Void, - FunctionSignature_VoidThatTakesActualResult, - GeneratedFiles, - GetBasicSolutionFileRequest, - GetBasicSolutionFileResponse, - GetFunctionSignatureRequest, - GetFunctionSignatureResponse, - GetGeneratedTestCaseFileRequest, - GetGeneratedTestCaseTemplateFileRequest, - LightweightProblemInfoV2, - NonVoidFunctionDefinition, - NonVoidFunctionSignature, - Parameter, - ParameterId, - ProblemInfoV2, - TestCaseExpects, - TestCaseFunction, - TestCaseFunction_Custom, - TestCaseFunction_WithActualResult, - TestCaseId, - TestCaseImplementation, - TestCaseImplementationDescription, - TestCaseImplementationDescriptionBoard, - TestCaseImplementationDescriptionBoard_Html, - TestCaseImplementationDescriptionBoard_ParamId, - TestCaseImplementationReference, - TestCaseImplementationReference_Implementation, - TestCaseImplementationReference_TemplateId, - TestCaseMetadata, - TestCaseTemplate, - TestCaseTemplateId, - TestCaseV2, - TestCaseWithActualResultImplementation, - VoidFunctionDefinition, - VoidFunctionDefinitionThatTakesActualResult, - VoidFunctionSignature, - VoidFunctionSignatureThatTakesActualResult, -) - -__all__ = [ - "AssertCorrectnessCheck", - "AssertCorrectnessCheck_Custom", - "AssertCorrectnessCheck_DeepEquality", - "BasicCustomFiles", - "BasicTestCaseTemplate", - "CreateProblemRequestV2", - "CustomFiles", - "CustomFiles_Basic", - "CustomFiles_Custom", - "DeepEqualityCorrectnessCheck", - "DefaultProvidedFile", - "FileInfoV2", - "Files", - "FunctionImplementation", - "FunctionImplementationForMultipleLanguages", - "FunctionSignature", - "FunctionSignature_NonVoid", - "FunctionSignature_Void", - "FunctionSignature_VoidThatTakesActualResult", - "GeneratedFiles", - "GetBasicSolutionFileRequest", - "GetBasicSolutionFileResponse", - "GetFunctionSignatureRequest", - "GetFunctionSignatureResponse", - "GetGeneratedTestCaseFileRequest", - "GetGeneratedTestCaseTemplateFileRequest", - "LightweightProblemInfoV2", - "NonVoidFunctionDefinition", - "NonVoidFunctionSignature", - "Parameter", - "ParameterId", - "ProblemInfoV2", - "TestCaseExpects", - "TestCaseFunction", - "TestCaseFunction_Custom", - "TestCaseFunction_WithActualResult", - "TestCaseId", - "TestCaseImplementation", - "TestCaseImplementationDescription", - "TestCaseImplementationDescriptionBoard", - "TestCaseImplementationDescriptionBoard_Html", - "TestCaseImplementationDescriptionBoard_ParamId", - "TestCaseImplementationReference", - "TestCaseImplementationReference_Implementation", - "TestCaseImplementationReference_TemplateId", - "TestCaseMetadata", - "TestCaseTemplate", - "TestCaseTemplateId", - "TestCaseV2", - "TestCaseWithActualResultImplementation", - "VoidFunctionDefinition", - "VoidFunctionDefinitionThatTakesActualResult", - "VoidFunctionSignature", - "VoidFunctionSignatureThatTakesActualResult", -] diff --git a/seed/sdk/trace/src/seed/resources/submission/types/__init__.py b/seed/sdk/trace/src/seed/submission/__init__.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/__init__.py rename to seed/sdk/trace/src/seed/submission/__init__.py diff --git a/seed/sdk/trace/src/seed/resources/submission/client.py b/seed/sdk/trace/src/seed/submission/_client.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/submission/client.py rename to seed/sdk/trace/src/seed/submission/_client.py index f4dfb83f8..da6909c74 100644 --- a/seed/sdk/trace/src/seed/resources/submission/client.py +++ b/seed/sdk/trace/src/seed/submission/_client.py @@ -4,11 +4,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ..commons.types.language import Language -from .types.execution_session_response import ExecutionSessionResponse -from .types.get_execution_session_state_response import GetExecutionSessionStateResponse +from ..commons.language import Language +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .execution_session_response import ExecutionSessionResponse +from .get_execution_session_state_response import GetExecutionSessionStateResponse try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/actual_result.py b/seed/sdk/trace/src/seed/submission/actual_result.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/submission/types/actual_result.py rename to seed/sdk/trace/src/seed/submission/actual_result.py index a4c562d6a..f7cc290bd 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/actual_result.py +++ b/seed/sdk/trace/src/seed/submission/actual_result.py @@ -43,4 +43,4 @@ class Config: ActualResult = typing.Union[ActualResult_Value, ActualResult_Exception, ActualResult_ExceptionV2] -from ...commons.types.variable_value import VariableValue # noqa: E402 +from ..commons.variable_value import VariableValue # noqa: E402 diff --git a/seed/sdk/trace/src/seed/resources/submission/types/building_executor_response.py b/seed/sdk/trace/src/seed/submission/building_executor_response.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/submission/types/building_executor_response.py rename to seed/sdk/trace/src/seed/submission/building_executor_response.py index 5d433569d..e51380614 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/building_executor_response.py +++ b/seed/sdk/trace/src/seed/submission/building_executor_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .execution_session_status import ExecutionSessionStatus from .submission_id import SubmissionId diff --git a/seed/sdk/trace/src/seed/resources/submission/types/code_execution_update.py b/seed/sdk/trace/src/seed/submission/code_execution_update.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/code_execution_update.py rename to seed/sdk/trace/src/seed/submission/code_execution_update.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/compile_error.py b/seed/sdk/trace/src/seed/submission/compile_error.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/submission/types/compile_error.py rename to seed/sdk/trace/src/seed/submission/compile_error.py index 9cc9b8703..5817c3f53 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/compile_error.py +++ b/seed/sdk/trace/src/seed/submission/compile_error.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/custom_test_cases_unsupported.py b/seed/sdk/trace/src/seed/submission/custom_test_cases_unsupported.py similarity index 90% rename from seed/sdk/trace/src/seed/resources/submission/types/custom_test_cases_unsupported.py rename to seed/sdk/trace/src/seed/submission/custom_test_cases_unsupported.py index 644e15c4f..94135663d 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/custom_test_cases_unsupported.py +++ b/seed/sdk/trace/src/seed/submission/custom_test_cases_unsupported.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.problem_id import ProblemId +from ..commons.problem_id import ProblemId +from ..core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/error_info.py b/seed/sdk/trace/src/seed/submission/error_info.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/error_info.py rename to seed/sdk/trace/src/seed/submission/error_info.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/errored_response.py b/seed/sdk/trace/src/seed/submission/errored_response.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/submission/types/errored_response.py rename to seed/sdk/trace/src/seed/submission/errored_response.py index 91f0bdd63..adf60d1de 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/errored_response.py +++ b/seed/sdk/trace/src/seed/submission/errored_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .error_info import ErrorInfo from .submission_id import SubmissionId diff --git a/seed/sdk/trace/src/seed/resources/submission/types/exception_info.py b/seed/sdk/trace/src/seed/submission/exception_info.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/submission/types/exception_info.py rename to seed/sdk/trace/src/seed/submission/exception_info.py index 7fc9bd581..210f4d168 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/exception_info.py +++ b/seed/sdk/trace/src/seed/submission/exception_info.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/exception_v_2.py b/seed/sdk/trace/src/seed/submission/exception_v_2.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/exception_v_2.py rename to seed/sdk/trace/src/seed/submission/exception_v_2.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/execution_session_response.py b/seed/sdk/trace/src/seed/submission/execution_session_response.py similarity index 91% rename from seed/sdk/trace/src/seed/resources/submission/types/execution_session_response.py rename to seed/sdk/trace/src/seed/submission/execution_session_response.py index a5b90274e..4674e2739 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/execution_session_response.py +++ b/seed/sdk/trace/src/seed/submission/execution_session_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.language import Language +from ..commons.language import Language +from ..core.datetime_utils import serialize_datetime from .execution_session_status import ExecutionSessionStatus try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/execution_session_state.py b/seed/sdk/trace/src/seed/submission/execution_session_state.py similarity index 86% rename from seed/sdk/trace/src/seed/resources/submission/types/execution_session_state.py rename to seed/sdk/trace/src/seed/submission/execution_session_state.py index e4ce7f48f..1f1b9bb10 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/execution_session_state.py +++ b/seed/sdk/trace/src/seed/submission/execution_session_state.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.language import Language +from ..commons.language import Language +from ..core.datetime_utils import serialize_datetime from .execution_session_status import ExecutionSessionStatus try: @@ -16,7 +16,7 @@ class ExecutionSessionState(pydantic.BaseModel): last_time_contacted: typing.Optional[str] = pydantic.Field(alias="lastTimeContacted") session_id: str = pydantic.Field( - alias="sessionId", description=("The auto-generated session id. Formatted as a uuid.\n") + alias="sessionId", description="The auto-generated session id. Formatted as a uuid." ) is_warm_instance: bool = pydantic.Field(alias="isWarmInstance") aws_task_id: typing.Optional[str] = pydantic.Field(alias="awsTaskId") diff --git a/seed/sdk/trace/src/seed/resources/submission/types/execution_session_status.py b/seed/sdk/trace/src/seed/submission/execution_session_status.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/execution_session_status.py rename to seed/sdk/trace/src/seed/submission/execution_session_status.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/existing_submission_executing.py b/seed/sdk/trace/src/seed/submission/existing_submission_executing.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/existing_submission_executing.py rename to seed/sdk/trace/src/seed/submission/existing_submission_executing.py index 811c97e8b..13c7ddb32 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/existing_submission_executing.py +++ b/seed/sdk/trace/src/seed/submission/existing_submission_executing.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/expression_location.py b/seed/sdk/trace/src/seed/submission/expression_location.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/submission/types/expression_location.py rename to seed/sdk/trace/src/seed/submission/expression_location.py index 6324e1b02..e6f0e95ef 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/expression_location.py +++ b/seed/sdk/trace/src/seed/submission/expression_location.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/finished_response.py b/seed/sdk/trace/src/seed/submission/finished_response.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/finished_response.py rename to seed/sdk/trace/src/seed/submission/finished_response.py index 78e1f11f4..8acab6429 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/finished_response.py +++ b/seed/sdk/trace/src/seed/submission/finished_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/get_execution_session_state_response.py b/seed/sdk/trace/src/seed/submission/get_execution_session_state_response.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/submission/types/get_execution_session_state_response.py rename to seed/sdk/trace/src/seed/submission/get_execution_session_state_response.py index 287db0b43..f6711d308 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/get_execution_session_state_response.py +++ b/seed/sdk/trace/src/seed/submission/get_execution_session_state_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .execution_session_state import ExecutionSessionState try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/get_submission_state_response.py b/seed/sdk/trace/src/seed/submission/get_submission_state_response.py similarity index 91% rename from seed/sdk/trace/src/seed/resources/submission/types/get_submission_state_response.py rename to seed/sdk/trace/src/seed/submission/get_submission_state_response.py index 9a7e6dc9a..757729c1e 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/get_submission_state_response.py +++ b/seed/sdk/trace/src/seed/submission/get_submission_state_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.language import Language +from ..commons.language import Language +from ..core.datetime_utils import serialize_datetime from .submission_type_state import SubmissionTypeState try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/get_trace_responses_page_request.py b/seed/sdk/trace/src/seed/submission/get_trace_responses_page_request.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/submission/types/get_trace_responses_page_request.py rename to seed/sdk/trace/src/seed/submission/get_trace_responses_page_request.py index ee6746366..2791e00b1 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/get_trace_responses_page_request.py +++ b/seed/sdk/trace/src/seed/submission/get_trace_responses_page_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/graded_response.py b/seed/sdk/trace/src/seed/submission/graded_response.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/submission/types/graded_response.py rename to seed/sdk/trace/src/seed/submission/graded_response.py index c9ca1a560..eefcea2ef 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/graded_response.py +++ b/seed/sdk/trace/src/seed/submission/graded_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .submission_id import SubmissionId from .test_case_result_with_stdout import TestCaseResultWithStdout diff --git a/seed/sdk/trace/src/seed/resources/submission/types/graded_response_v_2.py b/seed/sdk/trace/src/seed/submission/graded_response_v_2.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/submission/types/graded_response_v_2.py rename to seed/sdk/trace/src/seed/submission/graded_response_v_2.py index 85564fa1a..b4b774e14 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/graded_response_v_2.py +++ b/seed/sdk/trace/src/seed/submission/graded_response_v_2.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...v_2.resources.problem.types.test_case_id import TestCaseId +from ..core.datetime_utils import serialize_datetime +from ..v_2.problem.test_case_id import TestCaseId from .submission_id import SubmissionId from .test_case_grade import TestCaseGrade diff --git a/seed/sdk/trace/src/seed/resources/submission/types/graded_test_case_update.py b/seed/sdk/trace/src/seed/submission/graded_test_case_update.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/submission/types/graded_test_case_update.py rename to seed/sdk/trace/src/seed/submission/graded_test_case_update.py index da34e208c..2cfd7a9ee 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/graded_test_case_update.py +++ b/seed/sdk/trace/src/seed/submission/graded_test_case_update.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...v_2.resources.problem.types.test_case_id import TestCaseId +from ..core.datetime_utils import serialize_datetime +from ..v_2.problem.test_case_id import TestCaseId from .test_case_grade import TestCaseGrade try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/initialize_problem_request.py b/seed/sdk/trace/src/seed/submission/initialize_problem_request.py similarity index 90% rename from seed/sdk/trace/src/seed/resources/submission/types/initialize_problem_request.py rename to seed/sdk/trace/src/seed/submission/initialize_problem_request.py index a17fe27c2..fe42233ab 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/initialize_problem_request.py +++ b/seed/sdk/trace/src/seed/submission/initialize_problem_request.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.problem_id import ProblemId +from ..commons.problem_id import ProblemId +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/internal_error.py b/seed/sdk/trace/src/seed/submission/internal_error.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/internal_error.py rename to seed/sdk/trace/src/seed/submission/internal_error.py index 60745e4c9..e5cdd8cd5 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/internal_error.py +++ b/seed/sdk/trace/src/seed/submission/internal_error.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .exception_info import ExceptionInfo try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/invalid_request_cause.py b/seed/sdk/trace/src/seed/submission/invalid_request_cause.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/invalid_request_cause.py rename to seed/sdk/trace/src/seed/submission/invalid_request_cause.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/invalid_request_response.py b/seed/sdk/trace/src/seed/submission/invalid_request_response.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/invalid_request_response.py rename to seed/sdk/trace/src/seed/submission/invalid_request_response.py index 60e18cd41..1c625cffa 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/invalid_request_response.py +++ b/seed/sdk/trace/src/seed/submission/invalid_request_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .invalid_request_cause import InvalidRequestCause from .submission_request import SubmissionRequest diff --git a/seed/sdk/trace/src/seed/resources/submission/types/lightweight_stackframe_information.py b/seed/sdk/trace/src/seed/submission/lightweight_stackframe_information.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/lightweight_stackframe_information.py rename to seed/sdk/trace/src/seed/submission/lightweight_stackframe_information.py index ece9ffa40..47f98935e 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/lightweight_stackframe_information.py +++ b/seed/sdk/trace/src/seed/submission/lightweight_stackframe_information.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/recorded_response_notification.py b/seed/sdk/trace/src/seed/submission/recorded_response_notification.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/submission/types/recorded_response_notification.py rename to seed/sdk/trace/src/seed/submission/recorded_response_notification.py index 2f93874c4..a9067e66e 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/recorded_response_notification.py +++ b/seed/sdk/trace/src/seed/submission/recorded_response_notification.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/recorded_test_case_update.py b/seed/sdk/trace/src/seed/submission/recorded_test_case_update.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/submission/types/recorded_test_case_update.py rename to seed/sdk/trace/src/seed/submission/recorded_test_case_update.py index a1fcfc2e8..2452b52dc 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/recorded_test_case_update.py +++ b/seed/sdk/trace/src/seed/submission/recorded_test_case_update.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...v_2.resources.problem.types.test_case_id import TestCaseId +from ..core.datetime_utils import serialize_datetime +from ..v_2.problem.test_case_id import TestCaseId try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/recording_response_notification.py b/seed/sdk/trace/src/seed/submission/recording_response_notification.py similarity index 96% rename from seed/sdk/trace/src/seed/resources/submission/types/recording_response_notification.py rename to seed/sdk/trace/src/seed/submission/recording_response_notification.py index 5e1665b62..586bdc49f 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/recording_response_notification.py +++ b/seed/sdk/trace/src/seed/submission/recording_response_notification.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .lightweight_stackframe_information import LightweightStackframeInformation from .submission_id import SubmissionId from .traced_file import TracedFile diff --git a/seed/sdk/trace/src/seed/resources/submission/types/running_response.py b/seed/sdk/trace/src/seed/submission/running_response.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/submission/types/running_response.py rename to seed/sdk/trace/src/seed/submission/running_response.py index 5012a7101..92bf9efd0 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/running_response.py +++ b/seed/sdk/trace/src/seed/submission/running_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .running_submission_state import RunningSubmissionState from .submission_id import SubmissionId diff --git a/seed/sdk/trace/src/seed/resources/submission/types/running_submission_state.py b/seed/sdk/trace/src/seed/submission/running_submission_state.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/running_submission_state.py rename to seed/sdk/trace/src/seed/submission/running_submission_state.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/runtime_error.py b/seed/sdk/trace/src/seed/submission/runtime_error.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/submission/types/runtime_error.py rename to seed/sdk/trace/src/seed/submission/runtime_error.py index e10e953eb..94fb2577a 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/runtime_error.py +++ b/seed/sdk/trace/src/seed/submission/runtime_error.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/scope.py b/seed/sdk/trace/src/seed/submission/scope.py similarity index 87% rename from seed/sdk/trace/src/seed/resources/submission/types/scope.py rename to seed/sdk/trace/src/seed/submission/scope.py index 7758e82f4..5af2559d8 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/scope.py +++ b/seed/sdk/trace/src/seed/submission/scope.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.debug_variable_value import DebugVariableValue +from ..commons.debug_variable_value import DebugVariableValue +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/share_id.py b/seed/sdk/trace/src/seed/submission/share_id.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/share_id.py rename to seed/sdk/trace/src/seed/submission/share_id.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/stack_frame.py b/seed/sdk/trace/src/seed/submission/stack_frame.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/stack_frame.py rename to seed/sdk/trace/src/seed/submission/stack_frame.py index a8ee8de2a..42cedf709 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/stack_frame.py +++ b/seed/sdk/trace/src/seed/submission/stack_frame.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .scope import Scope try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/stack_information.py b/seed/sdk/trace/src/seed/submission/stack_information.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/stack_information.py rename to seed/sdk/trace/src/seed/submission/stack_information.py index b4fde6a9c..4b3f2fbe2 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/stack_information.py +++ b/seed/sdk/trace/src/seed/submission/stack_information.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .stack_frame import StackFrame try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/stderr_response.py b/seed/sdk/trace/src/seed/submission/stderr_response.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/stderr_response.py rename to seed/sdk/trace/src/seed/submission/stderr_response.py index 7b6444daf..b286ae80e 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/stderr_response.py +++ b/seed/sdk/trace/src/seed/submission/stderr_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/stdout_response.py b/seed/sdk/trace/src/seed/submission/stdout_response.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/stdout_response.py rename to seed/sdk/trace/src/seed/submission/stdout_response.py index 93ad42ec9..a5c1d91dd 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/stdout_response.py +++ b/seed/sdk/trace/src/seed/submission/stdout_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/stop_request.py b/seed/sdk/trace/src/seed/submission/stop_request.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/stop_request.py rename to seed/sdk/trace/src/seed/submission/stop_request.py index 5d63f2c04..bfa1dee76 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/stop_request.py +++ b/seed/sdk/trace/src/seed/submission/stop_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/stopped_response.py b/seed/sdk/trace/src/seed/submission/stopped_response.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/stopped_response.py rename to seed/sdk/trace/src/seed/submission/stopped_response.py index 89e71c9ba..ea29f271d 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/stopped_response.py +++ b/seed/sdk/trace/src/seed/submission/stopped_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/submission_file_info.py b/seed/sdk/trace/src/seed/submission/submission_file_info.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/submission_file_info.py rename to seed/sdk/trace/src/seed/submission/submission_file_info.py index c66895f0e..c80de2b08 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/submission_file_info.py +++ b/seed/sdk/trace/src/seed/submission/submission_file_info.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/submission_id.py b/seed/sdk/trace/src/seed/submission/submission_id.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/submission_id.py rename to seed/sdk/trace/src/seed/submission/submission_id.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/submission_id_not_found.py b/seed/sdk/trace/src/seed/submission/submission_id_not_found.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/submission_id_not_found.py rename to seed/sdk/trace/src/seed/submission/submission_id_not_found.py index dc7e4855b..ae10d7e24 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/submission_id_not_found.py +++ b/seed/sdk/trace/src/seed/submission/submission_id_not_found.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .submission_id import SubmissionId try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/submission_request.py b/seed/sdk/trace/src/seed/submission/submission_request.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/submission_request.py rename to seed/sdk/trace/src/seed/submission/submission_request.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/submission_response.py b/seed/sdk/trace/src/seed/submission/submission_response.py similarity index 97% rename from seed/sdk/trace/src/seed/resources/submission/types/submission_response.py rename to seed/sdk/trace/src/seed/submission/submission_response.py index 5ab852918..7bdd048c9 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/submission_response.py +++ b/seed/sdk/trace/src/seed/submission/submission_response.py @@ -6,7 +6,7 @@ import typing_extensions -from ...commons.types.problem_id import ProblemId +from ..commons.problem_id import ProblemId from .code_execution_update import CodeExecutionUpdate from .exception_info import ExceptionInfo from .terminated_response import TerminatedResponse diff --git a/seed/sdk/trace/src/seed/resources/submission/types/submission_status_for_test_case.py b/seed/sdk/trace/src/seed/submission/submission_status_for_test_case.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/submission_status_for_test_case.py rename to seed/sdk/trace/src/seed/submission/submission_status_for_test_case.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/submission_status_v_2.py b/seed/sdk/trace/src/seed/submission/submission_status_v_2.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/submission_status_v_2.py rename to seed/sdk/trace/src/seed/submission/submission_status_v_2.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/submission_type_enum.py b/seed/sdk/trace/src/seed/submission/submission_type_enum.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/submission_type_enum.py rename to seed/sdk/trace/src/seed/submission/submission_type_enum.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/submission_type_state.py b/seed/sdk/trace/src/seed/submission/submission_type_state.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/submission_type_state.py rename to seed/sdk/trace/src/seed/submission/submission_type_state.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/submit_request_v_2.py b/seed/sdk/trace/src/seed/submission/submit_request_v_2.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/submission/types/submit_request_v_2.py rename to seed/sdk/trace/src/seed/submission/submit_request_v_2.py index 45f8d5b72..a6e043385 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/submit_request_v_2.py +++ b/seed/sdk/trace/src/seed/submission/submit_request_v_2.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.language import Language -from ...commons.types.problem_id import ProblemId +from ..commons.language import Language +from ..commons.problem_id import ProblemId +from ..core.datetime_utils import serialize_datetime from .submission_file_info import SubmissionFileInfo from .submission_id import SubmissionId diff --git a/seed/sdk/trace/src/seed/resources/submission/types/terminated_response.py b/seed/sdk/trace/src/seed/submission/terminated_response.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/submission/types/terminated_response.py rename to seed/sdk/trace/src/seed/submission/terminated_response.py index b83d78183..b2603ccc1 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/terminated_response.py +++ b/seed/sdk/trace/src/seed/submission/terminated_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/test_case_grade.py b/seed/sdk/trace/src/seed/submission/test_case_grade.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/test_case_grade.py rename to seed/sdk/trace/src/seed/submission/test_case_grade.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/test_case_hidden_grade.py b/seed/sdk/trace/src/seed/submission/test_case_hidden_grade.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/submission/types/test_case_hidden_grade.py rename to seed/sdk/trace/src/seed/submission/test_case_hidden_grade.py index ea9aa3043..1390800b2 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/test_case_hidden_grade.py +++ b/seed/sdk/trace/src/seed/submission/test_case_hidden_grade.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/test_case_non_hidden_grade.py b/seed/sdk/trace/src/seed/submission/test_case_non_hidden_grade.py similarity index 90% rename from seed/sdk/trace/src/seed/resources/submission/types/test_case_non_hidden_grade.py rename to seed/sdk/trace/src/seed/submission/test_case_non_hidden_grade.py index 2f7147cef..45ad46eb4 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/test_case_non_hidden_grade.py +++ b/seed/sdk/trace/src/seed/submission/test_case_non_hidden_grade.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.variable_value import VariableValue +from ..commons.variable_value import VariableValue +from ..core.datetime_utils import serialize_datetime from .exception_v_2 import ExceptionV2 try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/test_case_result.py b/seed/sdk/trace/src/seed/submission/test_case_result.py similarity index 90% rename from seed/sdk/trace/src/seed/resources/submission/types/test_case_result.py rename to seed/sdk/trace/src/seed/submission/test_case_result.py index 79d19be4c..a9a6b57d3 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/test_case_result.py +++ b/seed/sdk/trace/src/seed/submission/test_case_result.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.variable_value import VariableValue +from ..commons.variable_value import VariableValue +from ..core.datetime_utils import serialize_datetime from .actual_result import ActualResult try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/test_case_result_with_stdout.py b/seed/sdk/trace/src/seed/submission/test_case_result_with_stdout.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/test_case_result_with_stdout.py rename to seed/sdk/trace/src/seed/submission/test_case_result_with_stdout.py index d93823147..cc1057d96 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/test_case_result_with_stdout.py +++ b/seed/sdk/trace/src/seed/submission/test_case_result_with_stdout.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .test_case_result import TestCaseResult try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/test_submission_state.py b/seed/sdk/trace/src/seed/submission/test_submission_state.py similarity index 88% rename from seed/sdk/trace/src/seed/resources/submission/types/test_submission_state.py rename to seed/sdk/trace/src/seed/submission/test_submission_state.py index b445cdeab..a5a96c889 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/test_submission_state.py +++ b/seed/sdk/trace/src/seed/submission/test_submission_state.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.problem_id import ProblemId -from ...commons.types.test_case import TestCase +from ..commons.problem_id import ProblemId +from ..commons.test_case import TestCase +from ..core.datetime_utils import serialize_datetime from .test_submission_status import TestSubmissionStatus try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/test_submission_status.py b/seed/sdk/trace/src/seed/submission/test_submission_status.py similarity index 72% rename from seed/sdk/trace/src/seed/resources/submission/types/test_submission_status.py rename to seed/sdk/trace/src/seed/submission/test_submission_status.py index d9c19b612..c985b188e 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/test_submission_status.py +++ b/seed/sdk/trace/src/seed/submission/test_submission_status.py @@ -6,13 +6,13 @@ import typing_extensions -from ...commons.types.binary_tree_node_value import BinaryTreeNodeValue -from ...commons.types.binary_tree_value import BinaryTreeValue -from ...commons.types.doubly_linked_list_node_value import DoublyLinkedListNodeValue -from ...commons.types.doubly_linked_list_value import DoublyLinkedListValue -from ...commons.types.node_id import NodeId -from ...commons.types.singly_linked_list_node_value import SinglyLinkedListNodeValue -from ...commons.types.singly_linked_list_value import SinglyLinkedListValue +from ..commons.binary_tree_node_value import BinaryTreeNodeValue +from ..commons.binary_tree_value import BinaryTreeValue +from ..commons.doubly_linked_list_node_value import DoublyLinkedListNodeValue +from ..commons.doubly_linked_list_value import DoublyLinkedListValue +from ..commons.node_id import NodeId +from ..commons.singly_linked_list_node_value import SinglyLinkedListNodeValue +from ..commons.singly_linked_list_value import SinglyLinkedListValue from .actual_result import ActualResult from .error_info import ErrorInfo from .exception_info import ExceptionInfo @@ -73,6 +73,6 @@ class Config: TestSubmissionStatus_Running, TestSubmissionStatus_TestCaseIdToState, ] -from ...commons.types.key_value_pair import KeyValuePair # noqa: E402 -from ...commons.types.map_value import MapValue # noqa: E402 -from ...commons.types.variable_value import VariableValue # noqa: E402 +from ..commons.key_value_pair import KeyValuePair # noqa: E402 +from ..commons.map_value import MapValue # noqa: E402 +from ..commons.variable_value import VariableValue # noqa: E402 diff --git a/seed/sdk/trace/src/seed/resources/submission/types/test_submission_status_v_2.py b/seed/sdk/trace/src/seed/submission/test_submission_status_v_2.py similarity index 86% rename from seed/sdk/trace/src/seed/resources/submission/types/test_submission_status_v_2.py rename to seed/sdk/trace/src/seed/submission/test_submission_status_v_2.py index defc94818..a7ab792fe 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/test_submission_status_v_2.py +++ b/seed/sdk/trace/src/seed/submission/test_submission_status_v_2.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.problem_id import ProblemId -from ...v_2.resources.problem.types.problem_info_v_2 import ProblemInfoV2 +from ..commons.problem_id import ProblemId +from ..core.datetime_utils import serialize_datetime +from ..v_2.problem.problem_info_v_2 import ProblemInfoV2 from .test_submission_update import TestSubmissionUpdate try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/test_submission_update.py b/seed/sdk/trace/src/seed/submission/test_submission_update.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/submission/types/test_submission_update.py rename to seed/sdk/trace/src/seed/submission/test_submission_update.py index 52e6b6282..8d9d93eb5 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/test_submission_update.py +++ b/seed/sdk/trace/src/seed/submission/test_submission_update.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .test_submission_update_info import TestSubmissionUpdateInfo try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/test_submission_update_info.py b/seed/sdk/trace/src/seed/submission/test_submission_update_info.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/test_submission_update_info.py rename to seed/sdk/trace/src/seed/submission/test_submission_update_info.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/trace_response.py b/seed/sdk/trace/src/seed/submission/trace_response.py similarity index 91% rename from seed/sdk/trace/src/seed/resources/submission/types/trace_response.py rename to seed/sdk/trace/src/seed/submission/trace_response.py index e24307fc0..f9a13c7b3 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/trace_response.py +++ b/seed/sdk/trace/src/seed/submission/trace_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.debug_variable_value import DebugVariableValue +from ..commons.debug_variable_value import DebugVariableValue +from ..core.datetime_utils import serialize_datetime from .expression_location import ExpressionLocation from .stack_information import StackInformation from .submission_id import SubmissionId diff --git a/seed/sdk/trace/src/seed/resources/submission/types/trace_response_v_2.py b/seed/sdk/trace/src/seed/submission/trace_response_v_2.py similarity index 92% rename from seed/sdk/trace/src/seed/resources/submission/types/trace_response_v_2.py rename to seed/sdk/trace/src/seed/submission/trace_response_v_2.py index 8c26968c4..ff6bc1db8 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/trace_response_v_2.py +++ b/seed/sdk/trace/src/seed/submission/trace_response_v_2.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.debug_variable_value import DebugVariableValue +from ..commons.debug_variable_value import DebugVariableValue +from ..core.datetime_utils import serialize_datetime from .expression_location import ExpressionLocation from .stack_information import StackInformation from .submission_id import SubmissionId diff --git a/seed/sdk/trace/src/seed/resources/submission/types/trace_responses_page.py b/seed/sdk/trace/src/seed/submission/trace_responses_page.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/submission/types/trace_responses_page.py rename to seed/sdk/trace/src/seed/submission/trace_responses_page.py index 3139c5020..02f1c8022 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/trace_responses_page.py +++ b/seed/sdk/trace/src/seed/submission/trace_responses_page.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .trace_response import TraceResponse try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/trace_responses_page_v_2.py b/seed/sdk/trace/src/seed/submission/trace_responses_page_v_2.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/submission/types/trace_responses_page_v_2.py rename to seed/sdk/trace/src/seed/submission/trace_responses_page_v_2.py index bb4f0e2b7..f67e2e545 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/trace_responses_page_v_2.py +++ b/seed/sdk/trace/src/seed/submission/trace_responses_page_v_2.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .trace_response_v_2 import TraceResponseV2 try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/traced_file.py b/seed/sdk/trace/src/seed/submission/traced_file.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/submission/types/traced_file.py rename to seed/sdk/trace/src/seed/submission/traced_file.py index 45a3a4a71..3544ca234 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/traced_file.py +++ b/seed/sdk/trace/src/seed/submission/traced_file.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/traced_test_case.py b/seed/sdk/trace/src/seed/submission/traced_test_case.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/traced_test_case.py rename to seed/sdk/trace/src/seed/submission/traced_test_case.py index f9287faeb..40f1f2efd 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/traced_test_case.py +++ b/seed/sdk/trace/src/seed/submission/traced_test_case.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .test_case_result_with_stdout import TestCaseResultWithStdout try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/unexpected_language_error.py b/seed/sdk/trace/src/seed/submission/unexpected_language_error.py similarity index 90% rename from seed/sdk/trace/src/seed/resources/submission/types/unexpected_language_error.py rename to seed/sdk/trace/src/seed/submission/unexpected_language_error.py index 3b5802286..d46973237 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/unexpected_language_error.py +++ b/seed/sdk/trace/src/seed/submission/unexpected_language_error.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.language import Language +from ..commons.language import Language +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/workspace_files.py b/seed/sdk/trace/src/seed/submission/workspace_files.py similarity index 90% rename from seed/sdk/trace/src/seed/resources/submission/types/workspace_files.py rename to seed/sdk/trace/src/seed/submission/workspace_files.py index 50fd99f9a..d93d2d1cb 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/workspace_files.py +++ b/seed/sdk/trace/src/seed/submission/workspace_files.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.file_info import FileInfo +from ..commons.file_info import FileInfo +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/workspace_ran_response.py b/seed/sdk/trace/src/seed/submission/workspace_ran_response.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/submission/types/workspace_ran_response.py rename to seed/sdk/trace/src/seed/submission/workspace_ran_response.py index cef337473..f66110d7f 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/workspace_ran_response.py +++ b/seed/sdk/trace/src/seed/submission/workspace_ran_response.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .submission_id import SubmissionId from .workspace_run_details import WorkspaceRunDetails diff --git a/seed/sdk/trace/src/seed/resources/submission/types/workspace_run_details.py b/seed/sdk/trace/src/seed/submission/workspace_run_details.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/submission/types/workspace_run_details.py rename to seed/sdk/trace/src/seed/submission/workspace_run_details.py index bd17711dc..02ad397f0 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/workspace_run_details.py +++ b/seed/sdk/trace/src/seed/submission/workspace_run_details.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .exception_info import ExceptionInfo from .exception_v_2 import ExceptionV2 diff --git a/seed/sdk/trace/src/seed/resources/submission/types/workspace_starter_files_response.py b/seed/sdk/trace/src/seed/submission/workspace_starter_files_response.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/submission/types/workspace_starter_files_response.py rename to seed/sdk/trace/src/seed/submission/workspace_starter_files_response.py index 23e246c30..68902dbfa 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/workspace_starter_files_response.py +++ b/seed/sdk/trace/src/seed/submission/workspace_starter_files_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.language import Language +from ..commons.language import Language +from ..core.datetime_utils import serialize_datetime from .workspace_files import WorkspaceFiles try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/workspace_starter_files_response_v_2.py b/seed/sdk/trace/src/seed/submission/workspace_starter_files_response_v_2.py similarity index 85% rename from seed/sdk/trace/src/seed/resources/submission/types/workspace_starter_files_response_v_2.py rename to seed/sdk/trace/src/seed/submission/workspace_starter_files_response_v_2.py index bb89acafb..08876d0f3 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/workspace_starter_files_response_v_2.py +++ b/seed/sdk/trace/src/seed/submission/workspace_starter_files_response_v_2.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.language import Language -from ...v_2.resources.problem.types.files import Files +from ..commons.language import Language +from ..core.datetime_utils import serialize_datetime +from ..v_2.problem.files import Files try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/submission/types/workspace_submission_state.py b/seed/sdk/trace/src/seed/submission/workspace_submission_state.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/workspace_submission_state.py rename to seed/sdk/trace/src/seed/submission/workspace_submission_state.py index 208941cd9..b2055633b 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/workspace_submission_state.py +++ b/seed/sdk/trace/src/seed/submission/workspace_submission_state.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .workspace_submission_status import WorkspaceSubmissionStatus try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/workspace_submission_status.py b/seed/sdk/trace/src/seed/submission/workspace_submission_status.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/workspace_submission_status.py rename to seed/sdk/trace/src/seed/submission/workspace_submission_status.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/workspace_submission_status_v_2.py b/seed/sdk/trace/src/seed/submission/workspace_submission_status_v_2.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/workspace_submission_status_v_2.py rename to seed/sdk/trace/src/seed/submission/workspace_submission_status_v_2.py index 3fea907d7..18532b21a 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/workspace_submission_status_v_2.py +++ b/seed/sdk/trace/src/seed/submission/workspace_submission_status_v_2.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .workspace_submission_update import WorkspaceSubmissionUpdate try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/workspace_submission_update.py b/seed/sdk/trace/src/seed/submission/workspace_submission_update.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/submission/types/workspace_submission_update.py rename to seed/sdk/trace/src/seed/submission/workspace_submission_update.py index f0fc71864..eebdfd6ad 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/workspace_submission_update.py +++ b/seed/sdk/trace/src/seed/submission/workspace_submission_update.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime from .workspace_submission_update_info import WorkspaceSubmissionUpdateInfo try: diff --git a/seed/sdk/trace/src/seed/resources/submission/types/workspace_submission_update_info.py b/seed/sdk/trace/src/seed/submission/workspace_submission_update_info.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/submission/types/workspace_submission_update_info.py rename to seed/sdk/trace/src/seed/submission/workspace_submission_update_info.py diff --git a/seed/sdk/trace/src/seed/resources/submission/types/workspace_submit_request.py b/seed/sdk/trace/src/seed/submission/workspace_submit_request.py similarity index 92% rename from seed/sdk/trace/src/seed/resources/submission/types/workspace_submit_request.py rename to seed/sdk/trace/src/seed/submission/workspace_submit_request.py index 7acd8ee57..2c5ffef69 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/workspace_submit_request.py +++ b/seed/sdk/trace/src/seed/submission/workspace_submit_request.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime -from ...commons.types.language import Language +from ..commons.language import Language +from ..core.datetime_utils import serialize_datetime from .submission_file_info import SubmissionFileInfo from .submission_id import SubmissionId diff --git a/seed/sdk/trace/src/seed/resources/submission/types/workspace_traced_update.py b/seed/sdk/trace/src/seed/submission/workspace_traced_update.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/submission/types/workspace_traced_update.py rename to seed/sdk/trace/src/seed/submission/workspace_traced_update.py index 9203c3df3..fd4d13514 100644 --- a/seed/sdk/trace/src/seed/resources/submission/types/workspace_traced_update.py +++ b/seed/sdk/trace/src/seed/submission/workspace_traced_update.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/circular-references/src/seed/resources/a/__init__.py b/seed/sdk/trace/src/seed/sysprop/__init__.py similarity index 63% rename from seed/sdk/circular-references/src/seed/resources/a/__init__.py rename to seed/sdk/trace/src/seed/sysprop/__init__.py index 9ff17fd03..f3ea2659b 100644 --- a/seed/sdk/circular-references/src/seed/resources/a/__init__.py +++ b/seed/sdk/trace/src/seed/sysprop/__init__.py @@ -1,5 +1,2 @@ # This file was auto-generated by Fern from our API Definition. -from .types import A - -__all__ = ["A"] diff --git a/seed/sdk/trace/src/seed/resources/sysprop/client.py b/seed/sdk/trace/src/seed/sysprop/_client.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/sysprop/client.py rename to seed/sdk/trace/src/seed/sysprop/_client.py index ea77d298e..51704b251 100644 --- a/seed/sdk/trace/src/seed/resources/sysprop/client.py +++ b/seed/sdk/trace/src/seed/sysprop/_client.py @@ -4,9 +4,9 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ..commons.types.language import Language +from ..commons.language import Language +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/__init__.py b/seed/sdk/trace/src/seed/v_2/__init__.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/__init__.py rename to seed/sdk/trace/src/seed/v_2/__init__.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/client.py b/seed/sdk/trace/src/seed/v_2/_client.py similarity index 87% rename from seed/sdk/trace/src/seed/resources/v_2/client.py rename to seed/sdk/trace/src/seed/v_2/_client.py index a2085fb3e..7b328a5c9 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/client.py +++ b/seed/sdk/trace/src/seed/v_2/_client.py @@ -2,10 +2,10 @@ from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.problem.client import AsyncProblemClient, ProblemClient -from .resources.v_3.client import AsyncV3Client, V3Client +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .problem._client import AsyncProblemClient, ProblemClient +from .v_3._client import AsyncV3Client, V3Client class V2Client: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/__init__.py b/seed/sdk/trace/src/seed/v_2/problem/__init__.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/__init__.py rename to seed/sdk/trace/src/seed/v_2/problem/__init__.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/client.py b/seed/sdk/trace/src/seed/v_2/problem/_client.py similarity index 96% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/client.py rename to seed/sdk/trace/src/seed/v_2/problem/_client.py index f137f5a7c..c907bf298 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/client.py +++ b/seed/sdk/trace/src/seed/v_2/problem/_client.py @@ -4,11 +4,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from .....core.api_error import ApiError -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ....commons.types.problem_id import ProblemId -from .types.lightweight_problem_info_v_2 import LightweightProblemInfoV2 -from .types.problem_info_v_2 import ProblemInfoV2 +from ...commons.problem_id import ProblemId +from ...core.api_error import ApiError +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .lightweight_problem_info_v_2 import LightweightProblemInfoV2 +from .problem_info_v_2 import ProblemInfoV2 try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/assert_correctness_check.py b/seed/sdk/trace/src/seed/v_2/problem/assert_correctness_check.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/assert_correctness_check.py rename to seed/sdk/trace/src/seed/v_2/problem/assert_correctness_check.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/basic_custom_files.py b/seed/sdk/trace/src/seed/v_2/problem/basic_custom_files.py similarity index 92% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/basic_custom_files.py rename to seed/sdk/trace/src/seed/v_2/problem/basic_custom_files.py index 74e7f9f3c..c1fec0fb9 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/basic_custom_files.py +++ b/seed/sdk/trace/src/seed/v_2/problem/basic_custom_files.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from .....commons.types.language import Language +from ...commons.language import Language +from ...core.datetime_utils import serialize_datetime from .basic_test_case_template import BasicTestCaseTemplate from .files import Files from .non_void_function_signature import NonVoidFunctionSignature diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/basic_test_case_template.py b/seed/sdk/trace/src/seed/v_2/problem/basic_test_case_template.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/basic_test_case_template.py rename to seed/sdk/trace/src/seed/v_2/problem/basic_test_case_template.py index eb94eccca..3ae197626 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/basic_test_case_template.py +++ b/seed/sdk/trace/src/seed/v_2/problem/basic_test_case_template.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .parameter_id import ParameterId from .test_case_implementation_description import TestCaseImplementationDescription from .test_case_template_id import TestCaseTemplateId diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/create_problem_request_v_2.py b/seed/sdk/trace/src/seed/v_2/problem/create_problem_request_v_2.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/create_problem_request_v_2.py rename to seed/sdk/trace/src/seed/v_2/problem/create_problem_request_v_2.py index 770ecc431..bd555a3ca 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/create_problem_request_v_2.py +++ b/seed/sdk/trace/src/seed/v_2/problem/create_problem_request_v_2.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from .....commons.types.language import Language -from .....problem.types.problem_description import ProblemDescription +from ...commons.language import Language +from ...core.datetime_utils import serialize_datetime +from ...problem.problem_description import ProblemDescription from .custom_files import CustomFiles from .test_case_template import TestCaseTemplate from .test_case_v_2 import TestCaseV2 diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/custom_files.py b/seed/sdk/trace/src/seed/v_2/problem/custom_files.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/custom_files.py rename to seed/sdk/trace/src/seed/v_2/problem/custom_files.py index 012e11d4d..258dd490b 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/custom_files.py +++ b/seed/sdk/trace/src/seed/v_2/problem/custom_files.py @@ -6,7 +6,7 @@ import typing_extensions -from .....commons.types.language import Language +from ...commons.language import Language from .basic_custom_files import BasicCustomFiles from .file_info_v_2 import FileInfoV2 from .files import Files diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/deep_equality_correctness_check.py b/seed/sdk/trace/src/seed/v_2/problem/deep_equality_correctness_check.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/deep_equality_correctness_check.py rename to seed/sdk/trace/src/seed/v_2/problem/deep_equality_correctness_check.py index 63be399b3..2c149c267 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/deep_equality_correctness_check.py +++ b/seed/sdk/trace/src/seed/v_2/problem/deep_equality_correctness_check.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .parameter_id import ParameterId try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/default_provided_file.py b/seed/sdk/trace/src/seed/v_2/problem/default_provided_file.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/default_provided_file.py rename to seed/sdk/trace/src/seed/v_2/problem/default_provided_file.py index 006e13ea5..62df3f077 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/default_provided_file.py +++ b/seed/sdk/trace/src/seed/v_2/problem/default_provided_file.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from .....commons.types.variable_type import VariableType +from ...commons.variable_type import VariableType +from ...core.datetime_utils import serialize_datetime from .file_info_v_2 import FileInfoV2 try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/file_info_v_2.py b/seed/sdk/trace/src/seed/v_2/problem/file_info_v_2.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/file_info_v_2.py rename to seed/sdk/trace/src/seed/v_2/problem/file_info_v_2.py index 3a9257ef4..77b11b0b3 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/file_info_v_2.py +++ b/seed/sdk/trace/src/seed/v_2/problem/file_info_v_2.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/files.py b/seed/sdk/trace/src/seed/v_2/problem/files.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/files.py rename to seed/sdk/trace/src/seed/v_2/problem/files.py index 6827c04aa..d84d28d7f 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/files.py +++ b/seed/sdk/trace/src/seed/v_2/problem/files.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .file_info_v_2 import FileInfoV2 try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/function_implementation.py b/seed/sdk/trace/src/seed/v_2/problem/function_implementation.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/function_implementation.py rename to seed/sdk/trace/src/seed/v_2/problem/function_implementation.py index 2f754eb1f..e342fa8c1 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/function_implementation.py +++ b/seed/sdk/trace/src/seed/v_2/problem/function_implementation.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/function_implementation_for_multiple_languages.py b/seed/sdk/trace/src/seed/v_2/problem/function_implementation_for_multiple_languages.py similarity index 90% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/function_implementation_for_multiple_languages.py rename to seed/sdk/trace/src/seed/v_2/problem/function_implementation_for_multiple_languages.py index 149de95ea..eba8bed05 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/function_implementation_for_multiple_languages.py +++ b/seed/sdk/trace/src/seed/v_2/problem/function_implementation_for_multiple_languages.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from .....commons.types.language import Language +from ...commons.language import Language +from ...core.datetime_utils import serialize_datetime from .function_implementation import FunctionImplementation try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/function_signature.py b/seed/sdk/trace/src/seed/v_2/problem/function_signature.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/function_signature.py rename to seed/sdk/trace/src/seed/v_2/problem/function_signature.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/generated_files.py b/seed/sdk/trace/src/seed/v_2/problem/generated_files.py similarity index 91% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/generated_files.py rename to seed/sdk/trace/src/seed/v_2/problem/generated_files.py index dfaf3a6f7..c40f52866 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/generated_files.py +++ b/seed/sdk/trace/src/seed/v_2/problem/generated_files.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from .....commons.types.language import Language +from ...commons.language import Language +from ...core.datetime_utils import serialize_datetime from .files import Files try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_basic_solution_file_request.py b/seed/sdk/trace/src/seed/v_2/problem/get_basic_solution_file_request.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_basic_solution_file_request.py rename to seed/sdk/trace/src/seed/v_2/problem/get_basic_solution_file_request.py index a4ac65225..89c047ead 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_basic_solution_file_request.py +++ b/seed/sdk/trace/src/seed/v_2/problem/get_basic_solution_file_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .non_void_function_signature import NonVoidFunctionSignature try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_basic_solution_file_response.py b/seed/sdk/trace/src/seed/v_2/problem/get_basic_solution_file_response.py similarity index 90% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_basic_solution_file_response.py rename to seed/sdk/trace/src/seed/v_2/problem/get_basic_solution_file_response.py index 3ffa2354f..09f260534 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_basic_solution_file_response.py +++ b/seed/sdk/trace/src/seed/v_2/problem/get_basic_solution_file_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from .....commons.types.language import Language +from ...commons.language import Language +from ...core.datetime_utils import serialize_datetime from .file_info_v_2 import FileInfoV2 try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_function_signature_request.py b/seed/sdk/trace/src/seed/v_2/problem/get_function_signature_request.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_function_signature_request.py rename to seed/sdk/trace/src/seed/v_2/problem/get_function_signature_request.py index 78c537082..f1ab23974 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_function_signature_request.py +++ b/seed/sdk/trace/src/seed/v_2/problem/get_function_signature_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .function_signature import FunctionSignature try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_function_signature_response.py b/seed/sdk/trace/src/seed/v_2/problem/get_function_signature_response.py similarity index 90% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_function_signature_response.py rename to seed/sdk/trace/src/seed/v_2/problem/get_function_signature_response.py index b636c86e0..32d2f5a29 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_function_signature_response.py +++ b/seed/sdk/trace/src/seed/v_2/problem/get_function_signature_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from .....commons.types.language import Language +from ...commons.language import Language +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_generated_test_case_file_request.py b/seed/sdk/trace/src/seed/v_2/problem/get_generated_test_case_file_request.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_generated_test_case_file_request.py rename to seed/sdk/trace/src/seed/v_2/problem/get_generated_test_case_file_request.py index d329382b5..3668802fa 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_generated_test_case_file_request.py +++ b/seed/sdk/trace/src/seed/v_2/problem/get_generated_test_case_file_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .test_case_template import TestCaseTemplate from .test_case_v_2 import TestCaseV2 diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_generated_test_case_template_file_request.py b/seed/sdk/trace/src/seed/v_2/problem/get_generated_test_case_template_file_request.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_generated_test_case_template_file_request.py rename to seed/sdk/trace/src/seed/v_2/problem/get_generated_test_case_template_file_request.py index 36f3f4cc4..b7806a00d 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/get_generated_test_case_template_file_request.py +++ b/seed/sdk/trace/src/seed/v_2/problem/get_generated_test_case_template_file_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .test_case_template import TestCaseTemplate try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/lightweight_problem_info_v_2.py b/seed/sdk/trace/src/seed/v_2/problem/lightweight_problem_info_v_2.py similarity index 87% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/lightweight_problem_info_v_2.py rename to seed/sdk/trace/src/seed/v_2/problem/lightweight_problem_info_v_2.py index c76f72071..95e4564d2 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/lightweight_problem_info_v_2.py +++ b/seed/sdk/trace/src/seed/v_2/problem/lightweight_problem_info_v_2.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from .....commons.types.problem_id import ProblemId -from .....commons.types.variable_type import VariableType +from ...commons.problem_id import ProblemId +from ...commons.variable_type import VariableType +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/non_void_function_definition.py b/seed/sdk/trace/src/seed/v_2/problem/non_void_function_definition.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/non_void_function_definition.py rename to seed/sdk/trace/src/seed/v_2/problem/non_void_function_definition.py index f9245c485..06d8b0a88 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/non_void_function_definition.py +++ b/seed/sdk/trace/src/seed/v_2/problem/non_void_function_definition.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .function_implementation_for_multiple_languages import FunctionImplementationForMultipleLanguages from .non_void_function_signature import NonVoidFunctionSignature diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/non_void_function_signature.py b/seed/sdk/trace/src/seed/v_2/problem/non_void_function_signature.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/non_void_function_signature.py rename to seed/sdk/trace/src/seed/v_2/problem/non_void_function_signature.py index d4e5b36a0..28c805ddc 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/non_void_function_signature.py +++ b/seed/sdk/trace/src/seed/v_2/problem/non_void_function_signature.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from .....commons.types.variable_type import VariableType +from ...commons.variable_type import VariableType +from ...core.datetime_utils import serialize_datetime from .parameter import Parameter try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/parameter.py b/seed/sdk/trace/src/seed/v_2/problem/parameter.py similarity index 90% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/parameter.py rename to seed/sdk/trace/src/seed/v_2/problem/parameter.py index 514da1019..b584f6285 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/parameter.py +++ b/seed/sdk/trace/src/seed/v_2/problem/parameter.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from .....commons.types.variable_type import VariableType +from ...commons.variable_type import VariableType +from ...core.datetime_utils import serialize_datetime from .parameter_id import ParameterId try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/parameter_id.py b/seed/sdk/trace/src/seed/v_2/problem/parameter_id.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/parameter_id.py rename to seed/sdk/trace/src/seed/v_2/problem/parameter_id.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/problem_info_v_2.py b/seed/sdk/trace/src/seed/v_2/problem/problem_info_v_2.py similarity index 88% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/problem_info_v_2.py rename to seed/sdk/trace/src/seed/v_2/problem/problem_info_v_2.py index d5b634e72..aa1204d34 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/problem_info_v_2.py +++ b/seed/sdk/trace/src/seed/v_2/problem/problem_info_v_2.py @@ -3,10 +3,10 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from .....commons.types.language import Language -from .....commons.types.problem_id import ProblemId -from .....problem.types.problem_description import ProblemDescription +from ...commons.language import Language +from ...commons.problem_id import ProblemId +from ...core.datetime_utils import serialize_datetime +from ...problem.problem_description import ProblemDescription from .custom_files import CustomFiles from .generated_files import GeneratedFiles from .test_case_template import TestCaseTemplate diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_expects.py b/seed/sdk/trace/src/seed/v_2/problem/test_case_expects.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_expects.py rename to seed/sdk/trace/src/seed/v_2/problem/test_case_expects.py index cf24ce639..59fc521e1 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_expects.py +++ b/seed/sdk/trace/src/seed/v_2/problem/test_case_expects.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_function.py b/seed/sdk/trace/src/seed/v_2/problem/test_case_function.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_function.py rename to seed/sdk/trace/src/seed/v_2/problem/test_case_function.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_id.py b/seed/sdk/trace/src/seed/v_2/problem/test_case_id.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_id.py rename to seed/sdk/trace/src/seed/v_2/problem/test_case_id.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_implementation.py b/seed/sdk/trace/src/seed/v_2/problem/test_case_implementation.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_implementation.py rename to seed/sdk/trace/src/seed/v_2/problem/test_case_implementation.py index 0025ca03b..112e1b843 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_implementation.py +++ b/seed/sdk/trace/src/seed/v_2/problem/test_case_implementation.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .test_case_function import TestCaseFunction from .test_case_implementation_description import TestCaseImplementationDescription diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_implementation_description.py b/seed/sdk/trace/src/seed/v_2/problem/test_case_implementation_description.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_implementation_description.py rename to seed/sdk/trace/src/seed/v_2/problem/test_case_implementation_description.py index bf1ad67af..ebd05b350 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_implementation_description.py +++ b/seed/sdk/trace/src/seed/v_2/problem/test_case_implementation_description.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .test_case_implementation_description_board import TestCaseImplementationDescriptionBoard try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_implementation_description_board.py b/seed/sdk/trace/src/seed/v_2/problem/test_case_implementation_description_board.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_implementation_description_board.py rename to seed/sdk/trace/src/seed/v_2/problem/test_case_implementation_description_board.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_implementation_reference.py b/seed/sdk/trace/src/seed/v_2/problem/test_case_implementation_reference.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_implementation_reference.py rename to seed/sdk/trace/src/seed/v_2/problem/test_case_implementation_reference.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_metadata.py b/seed/sdk/trace/src/seed/v_2/problem/test_case_metadata.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_metadata.py rename to seed/sdk/trace/src/seed/v_2/problem/test_case_metadata.py index 0fcda6d9f..db5d6fe3c 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_metadata.py +++ b/seed/sdk/trace/src/seed/v_2/problem/test_case_metadata.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .test_case_id import TestCaseId try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_template.py b/seed/sdk/trace/src/seed/v_2/problem/test_case_template.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_template.py rename to seed/sdk/trace/src/seed/v_2/problem/test_case_template.py index c5bb18907..f5b951ca4 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_template.py +++ b/seed/sdk/trace/src/seed/v_2/problem/test_case_template.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .test_case_implementation import TestCaseImplementation from .test_case_template_id import TestCaseTemplateId diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_template_id.py b/seed/sdk/trace/src/seed/v_2/problem/test_case_template_id.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_template_id.py rename to seed/sdk/trace/src/seed/v_2/problem/test_case_template_id.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_v_2.py b/seed/sdk/trace/src/seed/v_2/problem/test_case_v_2.py similarity index 91% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_v_2.py rename to seed/sdk/trace/src/seed/v_2/problem/test_case_v_2.py index f599f16e0..c0d5e4c1a 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_v_2.py +++ b/seed/sdk/trace/src/seed/v_2/problem/test_case_v_2.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from .....commons.types.variable_value import VariableValue +from ...commons.variable_value import VariableValue +from ...core.datetime_utils import serialize_datetime from .parameter_id import ParameterId from .test_case_expects import TestCaseExpects from .test_case_implementation_reference import TestCaseImplementationReference diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_with_actual_result_implementation.py b/seed/sdk/trace/src/seed/v_2/problem/test_case_with_actual_result_implementation.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_with_actual_result_implementation.py rename to seed/sdk/trace/src/seed/v_2/problem/test_case_with_actual_result_implementation.py index 7b9525597..493f637d2 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/test_case_with_actual_result_implementation.py +++ b/seed/sdk/trace/src/seed/v_2/problem/test_case_with_actual_result_implementation.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .assert_correctness_check import AssertCorrectnessCheck from .non_void_function_definition import NonVoidFunctionDefinition diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/void_function_definition.py b/seed/sdk/trace/src/seed/v_2/problem/void_function_definition.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/void_function_definition.py rename to seed/sdk/trace/src/seed/v_2/problem/void_function_definition.py index 2fb75566e..701cb8dbf 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/void_function_definition.py +++ b/seed/sdk/trace/src/seed/v_2/problem/void_function_definition.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .function_implementation_for_multiple_languages import FunctionImplementationForMultipleLanguages from .parameter import Parameter diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/void_function_definition_that_takes_actual_result.py b/seed/sdk/trace/src/seed/v_2/problem/void_function_definition_that_takes_actual_result.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/void_function_definition_that_takes_actual_result.py rename to seed/sdk/trace/src/seed/v_2/problem/void_function_definition_that_takes_actual_result.py index 83c050421..43da589a0 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/void_function_definition_that_takes_actual_result.py +++ b/seed/sdk/trace/src/seed/v_2/problem/void_function_definition_that_takes_actual_result.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .function_implementation_for_multiple_languages import FunctionImplementationForMultipleLanguages from .parameter import Parameter diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/void_function_signature.py b/seed/sdk/trace/src/seed/v_2/problem/void_function_signature.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/void_function_signature.py rename to seed/sdk/trace/src/seed/v_2/problem/void_function_signature.py index b337986ff..ffea90aa1 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/void_function_signature.py +++ b/seed/sdk/trace/src/seed/v_2/problem/void_function_signature.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime +from ...core.datetime_utils import serialize_datetime from .parameter import Parameter try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/void_function_signature_that_takes_actual_result.py b/seed/sdk/trace/src/seed/v_2/problem/void_function_signature_that_takes_actual_result.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/void_function_signature_that_takes_actual_result.py rename to seed/sdk/trace/src/seed/v_2/problem/void_function_signature_that_takes_actual_result.py index f927d2d5c..97c79cf64 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/problem/types/void_function_signature_that_takes_actual_result.py +++ b/seed/sdk/trace/src/seed/v_2/problem/void_function_signature_that_takes_actual_result.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ......core.datetime_utils import serialize_datetime -from .....commons.types.variable_type import VariableType +from ...commons.variable_type import VariableType +from ...core.datetime_utils import serialize_datetime from .parameter import Parameter try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/__init__.py b/seed/sdk/trace/src/seed/v_2/v_3/__init__.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/__init__.py rename to seed/sdk/trace/src/seed/v_2/v_3/__init__.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/client.py b/seed/sdk/trace/src/seed/v_2/v_3/_client.py similarity index 76% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/client.py rename to seed/sdk/trace/src/seed/v_2/v_3/_client.py index 668d40714..d88c0348f 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/client.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/_client.py @@ -1,7 +1,7 @@ # This file was auto-generated by Fern from our API Definition. -from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.problem.client import AsyncProblemClient, ProblemClient +from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .problem._client import AsyncProblemClient, ProblemClient class V3Client: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/__init__.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/__init__.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/__init__.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/__init__.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/client.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/_client.py similarity index 96% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/client.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/_client.py index d87eaf837..bf4a928bd 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/client.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/_client.py @@ -4,11 +4,11 @@ import urllib.parse from json.decoder import JSONDecodeError -from .......core.api_error import ApiError -from .......core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ......commons.types.problem_id import ProblemId -from .types.lightweight_problem_info_v_2 import LightweightProblemInfoV2 -from .types.problem_info_v_2 import ProblemInfoV2 +from ....commons.problem_id import ProblemId +from ....core.api_error import ApiError +from ....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from .lightweight_problem_info_v_2 import LightweightProblemInfoV2 +from .problem_info_v_2 import ProblemInfoV2 try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/assert_correctness_check.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/assert_correctness_check.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/assert_correctness_check.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/assert_correctness_check.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/basic_custom_files.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/basic_custom_files.py similarity index 92% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/basic_custom_files.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/basic_custom_files.py index fc2b1ddc2..1f27c2fdd 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/basic_custom_files.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/basic_custom_files.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.language import Language +from ....commons.language import Language +from ....core.datetime_utils import serialize_datetime from .basic_test_case_template import BasicTestCaseTemplate from .files import Files from .non_void_function_signature import NonVoidFunctionSignature diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/basic_test_case_template.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/basic_test_case_template.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/basic_test_case_template.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/basic_test_case_template.py index a1aaaefe0..6dea4ce3e 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/basic_test_case_template.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/basic_test_case_template.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .parameter_id import ParameterId from .test_case_implementation_description import TestCaseImplementationDescription from .test_case_template_id import TestCaseTemplateId diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/create_problem_request_v_2.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/create_problem_request_v_2.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/create_problem_request_v_2.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/create_problem_request_v_2.py index a275f6674..50d9516f3 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/create_problem_request_v_2.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/create_problem_request_v_2.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.language import Language -from .......problem.types.problem_description import ProblemDescription +from ....commons.language import Language +from ....core.datetime_utils import serialize_datetime +from ....problem.problem_description import ProblemDescription from .custom_files import CustomFiles from .test_case_template import TestCaseTemplate from .test_case_v_2 import TestCaseV2 diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/custom_files.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/custom_files.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/custom_files.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/custom_files.py index 64f3c800a..b9b168d6b 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/custom_files.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/custom_files.py @@ -6,7 +6,7 @@ import typing_extensions -from .......commons.types.language import Language +from ....commons.language import Language from .basic_custom_files import BasicCustomFiles from .file_info_v_2 import FileInfoV2 from .files import Files diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/deep_equality_correctness_check.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/deep_equality_correctness_check.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/deep_equality_correctness_check.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/deep_equality_correctness_check.py index 8aafa2536..84e3ffc84 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/deep_equality_correctness_check.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/deep_equality_correctness_check.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .parameter_id import ParameterId try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/default_provided_file.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/default_provided_file.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/default_provided_file.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/default_provided_file.py index 61a9a85f5..68d553dc0 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/default_provided_file.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/default_provided_file.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.variable_type import VariableType +from ....commons.variable_type import VariableType +from ....core.datetime_utils import serialize_datetime from .file_info_v_2 import FileInfoV2 try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/file_info_v_2.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/file_info_v_2.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/file_info_v_2.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/file_info_v_2.py index a0adf3d6d..da3c2a4d2 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/file_info_v_2.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/file_info_v_2.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/files.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/files.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/files.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/files.py index 74a4daa91..f2c3b16b7 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/files.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/files.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .file_info_v_2 import FileInfoV2 try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/function_implementation.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/function_implementation.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/function_implementation.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/function_implementation.py index 93233c53c..131833e0c 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/function_implementation.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/function_implementation.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/function_implementation_for_multiple_languages.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/function_implementation_for_multiple_languages.py similarity index 90% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/function_implementation_for_multiple_languages.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/function_implementation_for_multiple_languages.py index 39bb0ac5e..e135cb9c1 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/function_implementation_for_multiple_languages.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/function_implementation_for_multiple_languages.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.language import Language +from ....commons.language import Language +from ....core.datetime_utils import serialize_datetime from .function_implementation import FunctionImplementation try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/function_signature.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/function_signature.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/function_signature.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/function_signature.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/generated_files.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/generated_files.py similarity index 91% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/generated_files.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/generated_files.py index 527158557..743ee7ea2 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/generated_files.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/generated_files.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.language import Language +from ....commons.language import Language +from ....core.datetime_utils import serialize_datetime from .files import Files try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_basic_solution_file_request.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/get_basic_solution_file_request.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_basic_solution_file_request.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/get_basic_solution_file_request.py index f67b0f076..1deaa3601 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_basic_solution_file_request.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/get_basic_solution_file_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .non_void_function_signature import NonVoidFunctionSignature try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_basic_solution_file_response.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/get_basic_solution_file_response.py similarity index 90% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_basic_solution_file_response.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/get_basic_solution_file_response.py index 9169342d0..23bc45ce4 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_basic_solution_file_response.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/get_basic_solution_file_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.language import Language +from ....commons.language import Language +from ....core.datetime_utils import serialize_datetime from .file_info_v_2 import FileInfoV2 try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_function_signature_request.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/get_function_signature_request.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_function_signature_request.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/get_function_signature_request.py index 4504a8bd5..199f716d8 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_function_signature_request.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/get_function_signature_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .function_signature import FunctionSignature try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_function_signature_response.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/get_function_signature_response.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_function_signature_response.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/get_function_signature_response.py index 4452efbaf..b110de38b 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_function_signature_response.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/get_function_signature_response.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.language import Language +from ....commons.language import Language +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_generated_test_case_file_request.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/get_generated_test_case_file_request.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_generated_test_case_file_request.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/get_generated_test_case_file_request.py index 4e9447577..8f6f4ce56 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_generated_test_case_file_request.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/get_generated_test_case_file_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .test_case_template import TestCaseTemplate from .test_case_v_2 import TestCaseV2 diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_generated_test_case_template_file_request.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/get_generated_test_case_template_file_request.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_generated_test_case_template_file_request.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/get_generated_test_case_template_file_request.py index 3aa11854d..7ab3a08a2 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/get_generated_test_case_template_file_request.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/get_generated_test_case_template_file_request.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .test_case_template import TestCaseTemplate try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/lightweight_problem_info_v_2.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/lightweight_problem_info_v_2.py similarity index 86% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/lightweight_problem_info_v_2.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/lightweight_problem_info_v_2.py index 75d29e6ae..bff8c70f6 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/lightweight_problem_info_v_2.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/lightweight_problem_info_v_2.py @@ -3,9 +3,9 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.problem_id import ProblemId -from .......commons.types.variable_type import VariableType +from ....commons.problem_id import ProblemId +from ....commons.variable_type import VariableType +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/non_void_function_definition.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/non_void_function_definition.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/non_void_function_definition.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/non_void_function_definition.py index 114c29975..1083f2fed 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/non_void_function_definition.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/non_void_function_definition.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .function_implementation_for_multiple_languages import FunctionImplementationForMultipleLanguages from .non_void_function_signature import NonVoidFunctionSignature diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/non_void_function_signature.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/non_void_function_signature.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/non_void_function_signature.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/non_void_function_signature.py index a88a27910..5ce426f77 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/non_void_function_signature.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/non_void_function_signature.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.variable_type import VariableType +from ....commons.variable_type import VariableType +from ....core.datetime_utils import serialize_datetime from .parameter import Parameter try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/parameter.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/parameter.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/parameter.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/parameter.py index a854e2625..90f19c8ed 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/parameter.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/parameter.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.variable_type import VariableType +from ....commons.variable_type import VariableType +from ....core.datetime_utils import serialize_datetime from .parameter_id import ParameterId try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/parameter_id.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/parameter_id.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/parameter_id.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/parameter_id.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/problem_info_v_2.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/problem_info_v_2.py similarity index 88% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/problem_info_v_2.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/problem_info_v_2.py index f96a36c39..29ea183a1 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/problem_info_v_2.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/problem_info_v_2.py @@ -3,10 +3,10 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.language import Language -from .......commons.types.problem_id import ProblemId -from .......problem.types.problem_description import ProblemDescription +from ....commons.language import Language +from ....commons.problem_id import ProblemId +from ....core.datetime_utils import serialize_datetime +from ....problem.problem_description import ProblemDescription from .custom_files import CustomFiles from .generated_files import GeneratedFiles from .test_case_template import TestCaseTemplate diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_expects.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_expects.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_expects.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_expects.py index b584229eb..2d1e567d4 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_expects.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_expects.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_function.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_function.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_function.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_function.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_id.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_id.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_id.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_id.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_implementation.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_implementation.py index 7aa2ff925..3953931bc 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_implementation.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .test_case_function import TestCaseFunction from .test_case_implementation_description import TestCaseImplementationDescription diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_description.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_implementation_description.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_description.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_implementation_description.py index 14a27f270..45fdd4b72 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_description.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_implementation_description.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .test_case_implementation_description_board import TestCaseImplementationDescriptionBoard try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_description_board.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_implementation_description_board.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_description_board.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_implementation_description_board.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_reference.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_implementation_reference.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_implementation_reference.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_implementation_reference.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_metadata.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_metadata.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_metadata.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_metadata.py index 1151a6832..d5e28b378 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_metadata.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_metadata.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .test_case_id import TestCaseId try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_template.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_template.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_template.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_template.py index 19aa988b9..0d1865d3a 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_template.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_template.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .test_case_implementation import TestCaseImplementation from .test_case_template_id import TestCaseTemplateId diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_template_id.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_template_id.py similarity index 100% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_template_id.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_template_id.py diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_v_2.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_v_2.py similarity index 90% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_v_2.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_v_2.py index 1e8f40e32..9cf79bed2 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_v_2.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_v_2.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.variable_value import VariableValue +from ....commons.variable_value import VariableValue +from ....core.datetime_utils import serialize_datetime from .parameter_id import ParameterId from .test_case_expects import TestCaseExpects from .test_case_implementation_reference import TestCaseImplementationReference diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_with_actual_result_implementation.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_with_actual_result_implementation.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_with_actual_result_implementation.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_with_actual_result_implementation.py index 777007967..88805bacd 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/test_case_with_actual_result_implementation.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/test_case_with_actual_result_implementation.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .assert_correctness_check import AssertCorrectnessCheck from .non_void_function_definition import NonVoidFunctionDefinition diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/void_function_definition.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/void_function_definition.py similarity index 94% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/void_function_definition.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/void_function_definition.py index 6c89677d6..dbfe2c993 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/void_function_definition.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/void_function_definition.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .function_implementation_for_multiple_languages import FunctionImplementationForMultipleLanguages from .parameter import Parameter diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/void_function_definition_that_takes_actual_result.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/void_function_definition_that_takes_actual_result.py similarity index 95% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/void_function_definition_that_takes_actual_result.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/void_function_definition_that_takes_actual_result.py index e28694b30..b2cf60804 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/void_function_definition_that_takes_actual_result.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/void_function_definition_that_takes_actual_result.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .function_implementation_for_multiple_languages import FunctionImplementationForMultipleLanguages from .parameter import Parameter diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/void_function_signature.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/void_function_signature.py similarity index 93% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/void_function_signature.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/void_function_signature.py index 02919372e..07cbc9bbd 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/void_function_signature.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/void_function_signature.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime +from ....core.datetime_utils import serialize_datetime from .parameter import Parameter try: diff --git a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/void_function_signature_that_takes_actual_result.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/void_function_signature_that_takes_actual_result.py similarity index 89% rename from seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/void_function_signature_that_takes_actual_result.py rename to seed/sdk/trace/src/seed/v_2/v_3/problem/void_function_signature_that_takes_actual_result.py index 3e9120936..a9efae50a 100644 --- a/seed/sdk/trace/src/seed/resources/v_2/resources/v_3/resources/problem/types/void_function_signature_that_takes_actual_result.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/void_function_signature_that_takes_actual_result.py @@ -3,8 +3,8 @@ import datetime as dt import typing -from ........core.datetime_utils import serialize_datetime -from .......commons.types.variable_type import VariableType +from ....commons.variable_type import VariableType +from ....core.datetime_utils import serialize_datetime from .parameter import Parameter try: diff --git a/seed/sdk/undiscriminated-unions/src/seed/__init__.py b/seed/sdk/undiscriminated-unions/src/seed/__init__.py index 4cc332245..40af3cb7c 100644 --- a/seed/sdk/undiscriminated-unions/src/seed/__init__.py +++ b/seed/sdk/undiscriminated-unions/src/seed/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import MyUnion, union +from . import union +from .union import MyUnion __all__ = ["MyUnion", "union"] diff --git a/seed/sdk/undiscriminated-unions/src/seed/client.py b/seed/sdk/undiscriminated-unions/src/seed/client.py index 4aab784c6..e24c83416 100644 --- a/seed/sdk/undiscriminated-unions/src/seed/client.py +++ b/seed/sdk/undiscriminated-unions/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.union.client import AsyncUnionClient, UnionClient +from .union._client import AsyncUnionClient, UnionClient class SeedUndiscriminatedUnions: diff --git a/seed/sdk/undiscriminated-unions/src/seed/resources/__init__.py b/seed/sdk/undiscriminated-unions/src/seed/resources/__init__.py deleted file mode 100644 index 40af3cb7c..000000000 --- a/seed/sdk/undiscriminated-unions/src/seed/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import union -from .union import MyUnion - -__all__ = ["MyUnion", "union"] diff --git a/seed/sdk/undiscriminated-unions/src/seed/resources/union/__init__.py b/seed/sdk/undiscriminated-unions/src/seed/resources/union/__init__.py deleted file mode 100644 index fb0ca673c..000000000 --- a/seed/sdk/undiscriminated-unions/src/seed/resources/union/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import MyUnion - -__all__ = ["MyUnion"] diff --git a/seed/sdk/undiscriminated-unions/src/seed/resources/union/types/__init__.py b/seed/sdk/undiscriminated-unions/src/seed/union/__init__.py similarity index 100% rename from seed/sdk/undiscriminated-unions/src/seed/resources/union/types/__init__.py rename to seed/sdk/undiscriminated-unions/src/seed/union/__init__.py diff --git a/seed/sdk/undiscriminated-unions/src/seed/resources/union/client.py b/seed/sdk/undiscriminated-unions/src/seed/union/_client.py similarity index 91% rename from seed/sdk/undiscriminated-unions/src/seed/resources/union/client.py rename to seed/sdk/undiscriminated-unions/src/seed/union/_client.py index 0877fc788..8517b1d41 100644 --- a/seed/sdk/undiscriminated-unions/src/seed/resources/union/client.py +++ b/seed/sdk/undiscriminated-unions/src/seed/union/_client.py @@ -3,10 +3,10 @@ import typing from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder -from .types.my_union import MyUnion +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder +from .my_union import MyUnion try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/undiscriminated-unions/src/seed/resources/union/types/my_union.py b/seed/sdk/undiscriminated-unions/src/seed/union/my_union.py similarity index 100% rename from seed/sdk/undiscriminated-unions/src/seed/resources/union/types/my_union.py rename to seed/sdk/undiscriminated-unions/src/seed/union/my_union.py diff --git a/seed/sdk/unknown/src/seed/__init__.py b/seed/sdk/unknown/src/seed/__init__.py index faf4dfc14..78ba5bcd8 100644 --- a/seed/sdk/unknown/src/seed/__init__.py +++ b/seed/sdk/unknown/src/seed/__init__.py @@ -1,5 +1,6 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import MyAlias, MyObject, unknown +from . import unknown +from .unknown import MyAlias, MyObject __all__ = ["MyAlias", "MyObject", "unknown"] diff --git a/seed/sdk/unknown/src/seed/client.py b/seed/sdk/unknown/src/seed/client.py index d27d62883..6a5a7ed24 100644 --- a/seed/sdk/unknown/src/seed/client.py +++ b/seed/sdk/unknown/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.unknown.client import AsyncUnknownClient, UnknownClient +from .unknown._client import AsyncUnknownClient, UnknownClient class SeedUnknownAsAny: diff --git a/seed/sdk/unknown/src/seed/resources/__init__.py b/seed/sdk/unknown/src/seed/resources/__init__.py deleted file mode 100644 index 78ba5bcd8..000000000 --- a/seed/sdk/unknown/src/seed/resources/__init__.py +++ /dev/null @@ -1,6 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import unknown -from .unknown import MyAlias, MyObject - -__all__ = ["MyAlias", "MyObject", "unknown"] diff --git a/seed/sdk/unknown/src/seed/resources/unknown/__init__.py b/seed/sdk/unknown/src/seed/resources/unknown/__init__.py deleted file mode 100644 index ece22c5aa..000000000 --- a/seed/sdk/unknown/src/seed/resources/unknown/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from .types import MyAlias, MyObject - -__all__ = ["MyAlias", "MyObject"] diff --git a/seed/sdk/unknown/src/seed/resources/unknown/types/__init__.py b/seed/sdk/unknown/src/seed/unknown/__init__.py similarity index 100% rename from seed/sdk/unknown/src/seed/resources/unknown/types/__init__.py rename to seed/sdk/unknown/src/seed/unknown/__init__.py diff --git a/seed/sdk/unknown/src/seed/resources/unknown/client.py b/seed/sdk/unknown/src/seed/unknown/_client.py similarity index 93% rename from seed/sdk/unknown/src/seed/resources/unknown/client.py rename to seed/sdk/unknown/src/seed/unknown/_client.py index 9a76b155e..cb2f51d55 100644 --- a/seed/sdk/unknown/src/seed/resources/unknown/client.py +++ b/seed/sdk/unknown/src/seed/unknown/_client.py @@ -3,9 +3,9 @@ import typing from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from ...core.jsonable_encoder import jsonable_encoder +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.jsonable_encoder import jsonable_encoder try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/unknown/src/seed/resources/unknown/types/my_alias.py b/seed/sdk/unknown/src/seed/unknown/my_alias.py similarity index 100% rename from seed/sdk/unknown/src/seed/resources/unknown/types/my_alias.py rename to seed/sdk/unknown/src/seed/unknown/my_alias.py diff --git a/seed/sdk/unknown/src/seed/resources/unknown/types/my_object.py b/seed/sdk/unknown/src/seed/unknown/my_object.py similarity index 93% rename from seed/sdk/unknown/src/seed/resources/unknown/types/my_object.py rename to seed/sdk/unknown/src/seed/unknown/my_object.py index 343eb772d..a05863f62 100644 --- a/seed/sdk/unknown/src/seed/resources/unknown/types/my_object.py +++ b/seed/sdk/unknown/src/seed/unknown/my_object.py @@ -3,7 +3,7 @@ import datetime as dt import typing -from ....core.datetime_utils import serialize_datetime +from ..core.datetime_utils import serialize_datetime try: import pydantic.v1 as pydantic # type: ignore diff --git a/seed/sdk/variables/src/seed/__init__.py b/seed/sdk/variables/src/seed/__init__.py index e2f27dfce..43ae725f5 100644 --- a/seed/sdk/variables/src/seed/__init__.py +++ b/seed/sdk/variables/src/seed/__init__.py @@ -1,5 +1,5 @@ # This file was auto-generated by Fern from our API Definition. -from .resources import service +from . import service __all__ = ["service"] diff --git a/seed/sdk/variables/src/seed/client.py b/seed/sdk/variables/src/seed/client.py index 2f3a9534e..333054a3f 100644 --- a/seed/sdk/variables/src/seed/client.py +++ b/seed/sdk/variables/src/seed/client.py @@ -5,7 +5,7 @@ import httpx from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper -from .resources.service.client import AsyncServiceClient, ServiceClient +from .service._client import AsyncServiceClient, ServiceClient class SeedVariables: diff --git a/seed/sdk/variables/src/seed/resources/__init__.py b/seed/sdk/variables/src/seed/resources/__init__.py deleted file mode 100644 index 43ae725f5..000000000 --- a/seed/sdk/variables/src/seed/resources/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -# This file was auto-generated by Fern from our API Definition. - -from . import service - -__all__ = ["service"] diff --git a/seed/sdk/no-environment/src/seed/resources/__init__.py b/seed/sdk/variables/src/seed/service/__init__.py similarity index 61% rename from seed/sdk/no-environment/src/seed/resources/__init__.py rename to seed/sdk/variables/src/seed/service/__init__.py index c0b290959..f3ea2659b 100644 --- a/seed/sdk/no-environment/src/seed/resources/__init__.py +++ b/seed/sdk/variables/src/seed/service/__init__.py @@ -1,5 +1,2 @@ # This file was auto-generated by Fern from our API Definition. -from . import dummy - -__all__ = ["dummy"] diff --git a/seed/sdk/variables/src/seed/resources/service/client.py b/seed/sdk/variables/src/seed/service/_client.py similarity index 94% rename from seed/sdk/variables/src/seed/resources/service/client.py rename to seed/sdk/variables/src/seed/service/_client.py index f3423ce49..d4a1b0213 100644 --- a/seed/sdk/variables/src/seed/resources/service/client.py +++ b/seed/sdk/variables/src/seed/service/_client.py @@ -3,8 +3,8 @@ import urllib.parse from json.decoder import JSONDecodeError -from ...core.api_error import ApiError -from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper +from ..core.api_error import ApiError +from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper class ServiceClient: diff --git a/src/fern_python/generators/fastapi/declaration_referencers/fastapi_declaration_referencer.py b/src/fern_python/generators/fastapi/declaration_referencers/fastapi_declaration_referencer.py index 615ebc38e..7d30d87a2 100644 --- a/src/fern_python/generators/fastapi/declaration_referencers/fastapi_declaration_referencer.py +++ b/src/fern_python/generators/fastapi/declaration_referencers/fastapi_declaration_referencer.py @@ -16,10 +16,6 @@ def _get_directories_for_fern_filepath_part( export_strategy: ExportStrategy, ) -> Tuple[Filepath.DirectoryFilepathPart, ...]: return ( - Filepath.DirectoryFilepathPart( - module_name="resources", - export_strategy=ExportStrategy(export_all=True), - ), Filepath.DirectoryFilepathPart( module_name=fern_filepath_part.snake_case.unsafe_name, export_strategy=export_strategy, diff --git a/src/fern_python/generators/sdk/declaration_referencers/error_declaration_referencer.py b/src/fern_python/generators/sdk/declaration_referencers/error_declaration_referencer.py index 1ec6a3063..a9330dd03 100644 --- a/src/fern_python/generators/sdk/declaration_referencers/error_declaration_referencer.py +++ b/src/fern_python/generators/sdk/declaration_referencers/error_declaration_referencer.py @@ -1,6 +1,6 @@ import fern.ir.resources as ir_types -from fern_python.codegen import ExportStrategy, Filepath +from fern_python.codegen import Filepath from .sdk_declaration_referencer import SdkDeclarationReferencer @@ -10,12 +10,6 @@ def get_filepath(self, *, name: ir_types.DeclaredErrorName) -> Filepath: return Filepath( directories=self._get_directories_for_fern_filepath( fern_filepath=name.fern_filepath, - ) - + ( - Filepath.DirectoryFilepathPart( - module_name="errors", - export_strategy=ExportStrategy(export_all=True), - ), ), file=Filepath.FilepathPart(module_name=name.name.snake_case.unsafe_name), ) diff --git a/src/fern_python/generators/sdk/declaration_referencers/sdk_declaration_referencer.py b/src/fern_python/generators/sdk/declaration_referencers/sdk_declaration_referencer.py index f5bd7dcf3..ffb96d23c 100644 --- a/src/fern_python/generators/sdk/declaration_referencers/sdk_declaration_referencer.py +++ b/src/fern_python/generators/sdk/declaration_referencers/sdk_declaration_referencer.py @@ -16,10 +16,6 @@ def _get_directories_for_fern_filepath_part( export_strategy: ExportStrategy, ) -> Tuple[Filepath.DirectoryFilepathPart, ...]: return ( - Filepath.DirectoryFilepathPart( - module_name="resources", - export_strategy=ExportStrategy(export_all=True), - ), Filepath.DirectoryFilepathPart( module_name=fern_filepath_part.snake_case.unsafe_name, export_strategy=export_strategy, diff --git a/src/fern_python/generators/sdk/declaration_referencers/subpackage_async_client_declaration_referencer.py b/src/fern_python/generators/sdk/declaration_referencers/subpackage_async_client_declaration_referencer.py index a3a832d5c..aeba9ca5f 100644 --- a/src/fern_python/generators/sdk/declaration_referencers/subpackage_async_client_declaration_referencer.py +++ b/src/fern_python/generators/sdk/declaration_referencers/subpackage_async_client_declaration_referencer.py @@ -11,7 +11,7 @@ def get_filepath(self, *, name: ir_types.Subpackage) -> Filepath: directories=self._get_directories_for_fern_filepath( fern_filepath=name.fern_filepath, ), - file=Filepath.FilepathPart(module_name="client"), + file=Filepath.FilepathPart(module_name="_client"), ) def get_class_name(self, *, name: ir_types.Subpackage) -> str: diff --git a/src/fern_python/generators/sdk/declaration_referencers/subpackage_client_declaration_referencer.py b/src/fern_python/generators/sdk/declaration_referencers/subpackage_client_declaration_referencer.py index cca4ee559..c129735b2 100644 --- a/src/fern_python/generators/sdk/declaration_referencers/subpackage_client_declaration_referencer.py +++ b/src/fern_python/generators/sdk/declaration_referencers/subpackage_client_declaration_referencer.py @@ -11,7 +11,7 @@ def get_filepath(self, *, name: ir_types.Subpackage) -> Filepath: directories=self._get_directories_for_fern_filepath( fern_filepath=name.fern_filepath, ), - file=Filepath.FilepathPart(module_name="client"), + file=Filepath.FilepathPart(module_name="_client"), ) def get_class_name(self, *, name: ir_types.Subpackage) -> str: diff --git a/src/fern_python/generators/sdk/declaration_referencers/type_declaration_referencer.py b/src/fern_python/generators/sdk/declaration_referencers/type_declaration_referencer.py index 8a63e2b53..68a437dc4 100644 --- a/src/fern_python/generators/sdk/declaration_referencers/type_declaration_referencer.py +++ b/src/fern_python/generators/sdk/declaration_referencers/type_declaration_referencer.py @@ -1,6 +1,6 @@ import fern.ir.resources as ir_types -from fern_python.codegen import ExportStrategy, Filepath +from fern_python.codegen import Filepath from .sdk_declaration_referencer import SdkDeclarationReferencer @@ -10,12 +10,6 @@ def get_filepath(self, *, name: ir_types.DeclaredTypeName) -> Filepath: return Filepath( directories=self._get_directories_for_fern_filepath( fern_filepath=name.fern_filepath, - ) - + ( - Filepath.DirectoryFilepathPart( - module_name="types", - export_strategy=ExportStrategy(export_all=True), - ), ), file=Filepath.FilepathPart(module_name=name.name.snake_case.unsafe_name), ) diff --git a/src/fern_python/snippet/snippet_writer.py b/src/fern_python/snippet/snippet_writer.py index ed0d7abe8..5fe26be07 100644 --- a/src/fern_python/snippet/snippet_writer.py +++ b/src/fern_python/snippet/snippet_writer.py @@ -52,10 +52,6 @@ def get_module_path_for_declared_type_name( name: ir_types.DeclaredTypeName, ) -> AST.ModulePath: module_path = tuple([directory.snake_case.unsafe_name for directory in name.fern_filepath.package_path]) - if len(module_path) > 0: - # If the type is defined in a subpackge, it needs to be imported with the 'resources' - # intermediary key. Otherwise the types can be imported from the root package. - module_path = ("resources",) + module_path return self._context.get_module_path_in_project( module_path, ) From 0bcdcefb8f030489878f26ec14db5a80fe13dae6 Mon Sep 17 00:00:00 2001 From: Armando Belardo <11140328+armandobelardo@users.noreply.github.com> Date: Tue, 19 Dec 2023 14:32:38 -0500 Subject: [PATCH 5/6] [feat] Allow for making sets of primatives (#468) * Allow for making sets * fix types in visitor * seed tests * run seed again but bumped v * other seed tests * add fastapi tests too... --- .../endpoints/container/service/service.py | 6 ++--- .../types/object_with_optional_field.py | 2 +- .../endpoints/container/service/service.py | 6 ++--- .../types/object_with_optional_field.py | 2 +- .../endpoints/container/service/service.py | 6 ++--- .../types/object_with_optional_field.py | 2 +- .../endpoints/container/service/service.py | 6 ++--- .../types/object_with_optional_field.py | 2 +- seed/fastapi/object/types/type.py | 2 +- .../seed/examples/resources/types/metadata.py | 2 +- .../object/object_with_optional_field.py | 2 +- .../object/object_with_optional_field.py | 2 +- .../resources/service/maybe_list_or_set.py | 2 +- seed/pydantic/object/src/seed/object/type.py | 2 +- seed/sdk/examples/src/seed/types/metadata.py | 2 +- .../src/seed/endpoints/container/_client.py | 12 +++++----- .../object/object_with_optional_field.py | 2 +- .../src/seed/endpoints/container/_client.py | 12 +++++----- .../object/object_with_optional_field.py | 2 +- .../src/seed/endpoints/container/_client.py | 12 +++++----- .../object/object_with_optional_field.py | 2 +- .../src/seed/endpoints/container/_client.py | 12 +++++----- .../object/object_with_optional_field.py | 2 +- .../src/seed/endpoints/container/_client.py | 12 +++++----- .../object/object_with_optional_field.py | 2 +- .../src/seed/endpoints/container/_client.py | 12 +++++----- .../object/object_with_optional_field.py | 2 +- .../file-upload/src/seed/service/_client.py | 16 ++++++------- .../src/seed/service/maybe_list_or_set.py | 2 +- seed/sdk/object/src/seed/type.py | 2 +- .../type_reference_to_type_hint_converter.py | 24 +++++++++++++++---- 31 files changed, 94 insertions(+), 80 deletions(-) diff --git a/seed/fastapi/exhaustive/no-custom-config/endpoints/container/service/service.py b/seed/fastapi/exhaustive/no-custom-config/endpoints/container/service/service.py index f52a9c041..7d4c30073 100644 --- a/seed/fastapi/exhaustive/no-custom-config/endpoints/container/service/service.py +++ b/seed/fastapi/exhaustive/no-custom-config/endpoints/container/service/service.py @@ -35,7 +35,7 @@ def get_and_return_list_of_objects( ... @abc.abstractmethod - def get_and_return_set_of_primitives(self, *, body: typing.List[str], auth: ApiAuth) -> typing.List[str]: + def get_and_return_set_of_primitives(self, *, body: typing.Set[str], auth: ApiAuth) -> typing.Set[str]: ... @abc.abstractmethod @@ -173,7 +173,7 @@ def __init_get_and_return_set_of_primitives(cls, router: fastapi.APIRouter) -> N ) @functools.wraps(cls.get_and_return_set_of_primitives) - def wrapper(*args: typing.Any, **kwargs: typing.Any) -> typing.List[str]: + def wrapper(*args: typing.Any, **kwargs: typing.Any) -> typing.Set[str]: try: return cls.get_and_return_set_of_primitives(*args, **kwargs) except FernHTTPException as e: @@ -190,7 +190,7 @@ def wrapper(*args: typing.Any, **kwargs: typing.Any) -> typing.List[str]: router.post( path="/container/set-of-primitives", - response_model=typing.List[str], + response_model=typing.Set[str], description=AbstractEndpointsContainerService.get_and_return_set_of_primitives.__doc__, **get_route_args(cls.get_and_return_set_of_primitives, default_tag="endpoints.container"), )(wrapper) diff --git a/seed/fastapi/exhaustive/no-custom-config/types/object/types/object_with_optional_field.py b/seed/fastapi/exhaustive/no-custom-config/types/object/types/object_with_optional_field.py index 9ae8e7c60..0484551c4 100644 --- a/seed/fastapi/exhaustive/no-custom-config/types/object/types/object_with_optional_field.py +++ b/seed/fastapi/exhaustive/no-custom-config/types/object/types/object_with_optional_field.py @@ -23,7 +23,7 @@ class ObjectWithOptionalField(pydantic.BaseModel): uuid: typing.Optional[uuid.UUID] base_64: typing.Optional[str] = pydantic.Field(alias="base64") list: typing.Optional[typing.List[str]] - set: typing.Optional[typing.List[str]] + set: typing.Optional[typing.Set[str]] map: typing.Optional[typing.Dict[int, str]] def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/fastapi/exhaustive/pydantic-v1/endpoints/container/service/service.py b/seed/fastapi/exhaustive/pydantic-v1/endpoints/container/service/service.py index f52a9c041..7d4c30073 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/endpoints/container/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v1/endpoints/container/service/service.py @@ -35,7 +35,7 @@ def get_and_return_list_of_objects( ... @abc.abstractmethod - def get_and_return_set_of_primitives(self, *, body: typing.List[str], auth: ApiAuth) -> typing.List[str]: + def get_and_return_set_of_primitives(self, *, body: typing.Set[str], auth: ApiAuth) -> typing.Set[str]: ... @abc.abstractmethod @@ -173,7 +173,7 @@ def __init_get_and_return_set_of_primitives(cls, router: fastapi.APIRouter) -> N ) @functools.wraps(cls.get_and_return_set_of_primitives) - def wrapper(*args: typing.Any, **kwargs: typing.Any) -> typing.List[str]: + def wrapper(*args: typing.Any, **kwargs: typing.Any) -> typing.Set[str]: try: return cls.get_and_return_set_of_primitives(*args, **kwargs) except FernHTTPException as e: @@ -190,7 +190,7 @@ def wrapper(*args: typing.Any, **kwargs: typing.Any) -> typing.List[str]: router.post( path="/container/set-of-primitives", - response_model=typing.List[str], + response_model=typing.Set[str], description=AbstractEndpointsContainerService.get_and_return_set_of_primitives.__doc__, **get_route_args(cls.get_and_return_set_of_primitives, default_tag="endpoints.container"), )(wrapper) diff --git a/seed/fastapi/exhaustive/pydantic-v1/types/object/types/object_with_optional_field.py b/seed/fastapi/exhaustive/pydantic-v1/types/object/types/object_with_optional_field.py index 4a5e0ec9a..2bdf0eec1 100644 --- a/seed/fastapi/exhaustive/pydantic-v1/types/object/types/object_with_optional_field.py +++ b/seed/fastapi/exhaustive/pydantic-v1/types/object/types/object_with_optional_field.py @@ -20,7 +20,7 @@ class ObjectWithOptionalField(pydantic.BaseModel): uuid: typing.Optional[uuid.UUID] base_64: typing.Optional[str] = pydantic.Field(alias="base64") list: typing.Optional[typing.List[str]] - set: typing.Optional[typing.List[str]] + set: typing.Optional[typing.Set[str]] map: typing.Optional[typing.Dict[int, str]] def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/fastapi/exhaustive/pydantic-v2/endpoints/container/service/service.py b/seed/fastapi/exhaustive/pydantic-v2/endpoints/container/service/service.py index f52a9c041..7d4c30073 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/endpoints/container/service/service.py +++ b/seed/fastapi/exhaustive/pydantic-v2/endpoints/container/service/service.py @@ -35,7 +35,7 @@ def get_and_return_list_of_objects( ... @abc.abstractmethod - def get_and_return_set_of_primitives(self, *, body: typing.List[str], auth: ApiAuth) -> typing.List[str]: + def get_and_return_set_of_primitives(self, *, body: typing.Set[str], auth: ApiAuth) -> typing.Set[str]: ... @abc.abstractmethod @@ -173,7 +173,7 @@ def __init_get_and_return_set_of_primitives(cls, router: fastapi.APIRouter) -> N ) @functools.wraps(cls.get_and_return_set_of_primitives) - def wrapper(*args: typing.Any, **kwargs: typing.Any) -> typing.List[str]: + def wrapper(*args: typing.Any, **kwargs: typing.Any) -> typing.Set[str]: try: return cls.get_and_return_set_of_primitives(*args, **kwargs) except FernHTTPException as e: @@ -190,7 +190,7 @@ def wrapper(*args: typing.Any, **kwargs: typing.Any) -> typing.List[str]: router.post( path="/container/set-of-primitives", - response_model=typing.List[str], + response_model=typing.Set[str], description=AbstractEndpointsContainerService.get_and_return_set_of_primitives.__doc__, **get_route_args(cls.get_and_return_set_of_primitives, default_tag="endpoints.container"), )(wrapper) diff --git a/seed/fastapi/exhaustive/pydantic-v2/types/object/types/object_with_optional_field.py b/seed/fastapi/exhaustive/pydantic-v2/types/object/types/object_with_optional_field.py index a163539b8..39b54231c 100644 --- a/seed/fastapi/exhaustive/pydantic-v2/types/object/types/object_with_optional_field.py +++ b/seed/fastapi/exhaustive/pydantic-v2/types/object/types/object_with_optional_field.py @@ -20,7 +20,7 @@ class ObjectWithOptionalField(pydantic.BaseModel): uuid: typing.Optional[uuid.UUID] base_64: typing.Optional[str] = pydantic.Field(alias="base64") list: typing.Optional[typing.List[str]] - set: typing.Optional[typing.List[str]] + set: typing.Optional[typing.Set[str]] map: typing.Optional[typing.Dict[int, str]] def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/fastapi/exhaustive/skip-formatting/endpoints/container/service/service.py b/seed/fastapi/exhaustive/skip-formatting/endpoints/container/service/service.py index 85e134c85..fb7b27f3e 100644 --- a/seed/fastapi/exhaustive/skip-formatting/endpoints/container/service/service.py +++ b/seed/fastapi/exhaustive/skip-formatting/endpoints/container/service/service.py @@ -27,7 +27,7 @@ def get_and_return_list_of_primitives(self, *, body: typing.List[str], auth: Api def get_and_return_list_of_objects(self, *, body: typing.List[ObjectWithRequiredField], auth: ApiAuth) -> typing.List[ObjectWithRequiredField]: ... @abc.abstractmethod - def get_and_return_set_of_primitives(self, *, body: typing.List[str], auth: ApiAuth) -> typing.List[str]: + def get_and_return_set_of_primitives(self, *, body: typing.Set[str], auth: ApiAuth) -> typing.Set[str]: ... @abc.abstractmethod def get_and_return_set_of_objects(self, *, body: typing.List[ObjectWithRequiredField], auth: ApiAuth) -> typing.List[ObjectWithRequiredField]: @@ -144,7 +144,7 @@ def __init_get_and_return_set_of_primitives(cls, router: fastapi.APIRouter) -> N setattr(cls.get_and_return_set_of_primitives, "__signature__", endpoint_function.replace(parameters=new_parameters)) @functools.wraps(cls.get_and_return_set_of_primitives) - def wrapper(*args: typing.Any, **kwargs: typing.Any) -> typing.List[str]: + def wrapper(*args: typing.Any, **kwargs: typing.Any) -> typing.Set[str]: try: return cls.get_and_return_set_of_primitives(*args, **kwargs) except FernHTTPException as e: @@ -161,7 +161,7 @@ def wrapper(*args: typing.Any, **kwargs: typing.Any) -> typing.List[str]: router.post( path="/container/set-of-primitives", - response_model=typing.List[str], + response_model=typing.Set[str], description=AbstractEndpointsContainerService.get_and_return_set_of_primitives.__doc__, **get_route_args(cls.get_and_return_set_of_primitives, default_tag="endpoints.container"), )(wrapper) diff --git a/seed/fastapi/exhaustive/skip-formatting/types/object/types/object_with_optional_field.py b/seed/fastapi/exhaustive/skip-formatting/types/object/types/object_with_optional_field.py index 80a100533..2392f8ead 100644 --- a/seed/fastapi/exhaustive/skip-formatting/types/object/types/object_with_optional_field.py +++ b/seed/fastapi/exhaustive/skip-formatting/types/object/types/object_with_optional_field.py @@ -21,7 +21,7 @@ class ObjectWithOptionalField(pydantic.BaseModel): uuid: typing.Optional[uuid.UUID] base_64: typing.Optional[str] = pydantic.Field(alias="base64") list: typing.Optional[typing.List[str]] - set: typing.Optional[typing.List[str]] + set: typing.Optional[typing.Set[str]] map: typing.Optional[typing.Dict[int, str]] def json(self, **kwargs: typing.Any) -> str: kwargs_with_defaults: typing.Any = { "by_alias": True, "exclude_unset": True, **kwargs } diff --git a/seed/fastapi/object/types/type.py b/seed/fastapi/object/types/type.py index 4b0b1a0e4..13e6cbbe7 100644 --- a/seed/fastapi/object/types/type.py +++ b/seed/fastapi/object/types/type.py @@ -73,7 +73,7 @@ class Type(pydantic.BaseModel): eight: uuid.UUID nine: str ten: typing.List[int] - eleven: typing.List[float] + eleven: typing.Set[float] twelve: typing.Dict[str, bool] thirteen: typing.Optional[int] fourteen: typing.Any diff --git a/seed/pydantic/examples/src/seed/examples/resources/types/metadata.py b/seed/pydantic/examples/src/seed/examples/resources/types/metadata.py index 124f0e9cf..0ccc14e84 100644 --- a/seed/pydantic/examples/src/seed/examples/resources/types/metadata.py +++ b/seed/pydantic/examples/src/seed/examples/resources/types/metadata.py @@ -23,7 +23,7 @@ class Base(pydantic.BaseModel): """ extra: typing.Dict[str, str] - tags: typing.List[str] + tags: typing.Set[str] def json(self, **kwargs: typing.Any) -> str: kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} diff --git a/seed/pydantic/exhaustive/pydantic-v1/src/seed/exhaustive/resources/types/resources/object/object_with_optional_field.py b/seed/pydantic/exhaustive/pydantic-v1/src/seed/exhaustive/resources/types/resources/object/object_with_optional_field.py index 294099931..19e23b0a6 100644 --- a/seed/pydantic/exhaustive/pydantic-v1/src/seed/exhaustive/resources/types/resources/object/object_with_optional_field.py +++ b/seed/pydantic/exhaustive/pydantic-v1/src/seed/exhaustive/resources/types/resources/object/object_with_optional_field.py @@ -20,7 +20,7 @@ class ObjectWithOptionalField(pydantic.BaseModel): uuid: typing.Optional[uuid.UUID] base_64: typing.Optional[str] = pydantic.Field(alias="base64") list: typing.Optional[typing.List[str]] - set: typing.Optional[typing.List[str]] + set: typing.Optional[typing.Set[str]] map: typing.Optional[typing.Dict[int, str]] def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/pydantic/exhaustive/pydantic-v2/src/seed/exhaustive/resources/types/resources/object/object_with_optional_field.py b/seed/pydantic/exhaustive/pydantic-v2/src/seed/exhaustive/resources/types/resources/object/object_with_optional_field.py index b618c4097..7b1e6a75a 100644 --- a/seed/pydantic/exhaustive/pydantic-v2/src/seed/exhaustive/resources/types/resources/object/object_with_optional_field.py +++ b/seed/pydantic/exhaustive/pydantic-v2/src/seed/exhaustive/resources/types/resources/object/object_with_optional_field.py @@ -20,7 +20,7 @@ class ObjectWithOptionalField(pydantic.BaseModel): uuid: typing.Optional[uuid.UUID] base_64: typing.Optional[str] = pydantic.Field(alias="base64") list: typing.Optional[typing.List[str]] - set: typing.Optional[typing.List[str]] + set: typing.Optional[typing.Set[str]] map: typing.Optional[typing.Dict[int, str]] def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/pydantic/file-upload/src/seed/file_upload/resources/service/maybe_list_or_set.py b/seed/pydantic/file-upload/src/seed/file_upload/resources/service/maybe_list_or_set.py index efd075d2f..0cbc77211 100644 --- a/seed/pydantic/file-upload/src/seed/file_upload/resources/service/maybe_list_or_set.py +++ b/seed/pydantic/file-upload/src/seed/file_upload/resources/service/maybe_list_or_set.py @@ -3,5 +3,5 @@ import typing MaybeListOrSet = typing.Union[ - str, typing.List[str], int, typing.List[int], typing.List[typing.List[int]], typing.List[str] + str, typing.List[str], int, typing.List[int], typing.List[typing.List[int]], typing.Set[str] ] diff --git a/seed/pydantic/object/src/seed/object/type.py b/seed/pydantic/object/src/seed/object/type.py index 27dcfc754..b1d78ca1c 100644 --- a/seed/pydantic/object/src/seed/object/type.py +++ b/seed/pydantic/object/src/seed/object/type.py @@ -73,7 +73,7 @@ class Type(pydantic.BaseModel): eight: uuid.UUID nine: str ten: typing.List[int] - eleven: typing.List[float] + eleven: typing.Set[float] twelve: typing.Dict[str, bool] thirteen: typing.Optional[int] fourteen: typing.Any diff --git a/seed/sdk/examples/src/seed/types/metadata.py b/seed/sdk/examples/src/seed/types/metadata.py index 8ea1e7e14..cdb1f18f6 100644 --- a/seed/sdk/examples/src/seed/types/metadata.py +++ b/seed/sdk/examples/src/seed/types/metadata.py @@ -23,7 +23,7 @@ class Base(pydantic.BaseModel): """ extra: typing.Dict[str, str] - tags: typing.List[str] + tags: typing.Set[str] def json(self, **kwargs: typing.Any) -> str: kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs} diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/container/_client.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/container/_client.py index a2be5eada..7507a7002 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/container/_client.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/endpoints/container/_client.py @@ -64,10 +64,10 @@ def get_and_return_list_of_objects( raise ApiError(status_code=_response.status_code, body=_response.text) raise ApiError(status_code=_response.status_code, body=_response_json) - def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typing.List[str]: + def get_and_return_set_of_primitives(self, *, request: typing.Set[str]) -> typing.Set[str]: """ Parameters: - - request: typing.List[str]. + - request: typing.Set[str]. """ _response = self._client_wrapper.httpx_client.request( "POST", @@ -77,7 +77,7 @@ def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typi timeout=60, ) if 200 <= _response.status_code < 300: - return pydantic.parse_obj_as(typing.List[str], _response.json()) # type: ignore + return pydantic.parse_obj_as(typing.Set[str], _response.json()) # type: ignore try: _response_json = _response.json() except JSONDecodeError: @@ -217,10 +217,10 @@ async def get_and_return_list_of_objects( raise ApiError(status_code=_response.status_code, body=_response.text) raise ApiError(status_code=_response.status_code, body=_response_json) - async def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typing.List[str]: + async def get_and_return_set_of_primitives(self, *, request: typing.Set[str]) -> typing.Set[str]: """ Parameters: - - request: typing.List[str]. + - request: typing.Set[str]. """ _response = await self._client_wrapper.httpx_client.request( "POST", @@ -230,7 +230,7 @@ async def get_and_return_set_of_primitives(self, *, request: typing.List[str]) - timeout=60, ) if 200 <= _response.status_code < 300: - return pydantic.parse_obj_as(typing.List[str], _response.json()) # type: ignore + return pydantic.parse_obj_as(typing.Set[str], _response.json()) # type: ignore try: _response_json = _response.json() except JSONDecodeError: diff --git a/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_optional_field.py b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_optional_field.py index 00520e117..9e85b8440 100644 --- a/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_optional_field.py +++ b/seed/sdk/exhaustive/extra_dependencies/src/seed/types/object/object_with_optional_field.py @@ -23,7 +23,7 @@ class ObjectWithOptionalField(pydantic.BaseModel): uuid: typing.Optional[uuid.UUID] base_64: typing.Optional[str] = pydantic.Field(alias="base64") list: typing.Optional[typing.List[str]] - set: typing.Optional[typing.List[str]] + set: typing.Optional[typing.Set[str]] map: typing.Optional[typing.Dict[int, str]] def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/container/_client.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/container/_client.py index bdba9142e..39983ab11 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/container/_client.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/endpoints/container/_client.py @@ -64,10 +64,10 @@ def get_and_return_list_of_objects( raise ApiError(status_code=_response.status_code, body=_response.text) raise ApiError(status_code=_response.status_code, body=_response_json) - def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typing.List[str]: + def get_and_return_set_of_primitives(self, *, request: typing.Set[str]) -> typing.Set[str]: """ Parameters: - - request: typing.List[str]. + - request: typing.Set[str]. """ _response = self._client_wrapper.httpx_client.request( "POST", @@ -77,7 +77,7 @@ def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typi timeout=5, ) if 200 <= _response.status_code < 300: - return pydantic.parse_obj_as(typing.List[str], _response.json()) # type: ignore + return pydantic.parse_obj_as(typing.Set[str], _response.json()) # type: ignore try: _response_json = _response.json() except JSONDecodeError: @@ -217,10 +217,10 @@ async def get_and_return_list_of_objects( raise ApiError(status_code=_response.status_code, body=_response.text) raise ApiError(status_code=_response.status_code, body=_response_json) - async def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typing.List[str]: + async def get_and_return_set_of_primitives(self, *, request: typing.Set[str]) -> typing.Set[str]: """ Parameters: - - request: typing.List[str]. + - request: typing.Set[str]. """ _response = await self._client_wrapper.httpx_client.request( "POST", @@ -230,7 +230,7 @@ async def get_and_return_set_of_primitives(self, *, request: typing.List[str]) - timeout=5, ) if 200 <= _response.status_code < 300: - return pydantic.parse_obj_as(typing.List[str], _response.json()) # type: ignore + return pydantic.parse_obj_as(typing.Set[str], _response.json()) # type: ignore try: _response_json = _response.json() except JSONDecodeError: diff --git a/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_optional_field.py b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_optional_field.py index 00520e117..9e85b8440 100644 --- a/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_optional_field.py +++ b/seed/sdk/exhaustive/five-second-timeout/src/seed/types/object/object_with_optional_field.py @@ -23,7 +23,7 @@ class ObjectWithOptionalField(pydantic.BaseModel): uuid: typing.Optional[uuid.UUID] base_64: typing.Optional[str] = pydantic.Field(alias="base64") list: typing.Optional[typing.List[str]] - set: typing.Optional[typing.List[str]] + set: typing.Optional[typing.Set[str]] map: typing.Optional[typing.Dict[int, str]] def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/container/_client.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/container/_client.py index 8005ac298..9dec60986 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/container/_client.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/endpoints/container/_client.py @@ -64,10 +64,10 @@ def get_and_return_list_of_objects( raise ApiError(status_code=_response.status_code, body=_response.text) raise ApiError(status_code=_response.status_code, body=_response_json) - def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typing.List[str]: + def get_and_return_set_of_primitives(self, *, request: typing.Set[str]) -> typing.Set[str]: """ Parameters: - - request: typing.List[str]. + - request: typing.Set[str]. """ _response = self._client_wrapper.httpx_client.request( "POST", @@ -77,7 +77,7 @@ def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typi timeout=None, ) if 200 <= _response.status_code < 300: - return pydantic.parse_obj_as(typing.List[str], _response.json()) # type: ignore + return pydantic.parse_obj_as(typing.Set[str], _response.json()) # type: ignore try: _response_json = _response.json() except JSONDecodeError: @@ -217,10 +217,10 @@ async def get_and_return_list_of_objects( raise ApiError(status_code=_response.status_code, body=_response.text) raise ApiError(status_code=_response.status_code, body=_response_json) - async def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typing.List[str]: + async def get_and_return_set_of_primitives(self, *, request: typing.Set[str]) -> typing.Set[str]: """ Parameters: - - request: typing.List[str]. + - request: typing.Set[str]. """ _response = await self._client_wrapper.httpx_client.request( "POST", @@ -230,7 +230,7 @@ async def get_and_return_set_of_primitives(self, *, request: typing.List[str]) - timeout=None, ) if 200 <= _response.status_code < 300: - return pydantic.parse_obj_as(typing.List[str], _response.json()) # type: ignore + return pydantic.parse_obj_as(typing.Set[str], _response.json()) # type: ignore try: _response_json = _response.json() except JSONDecodeError: diff --git a/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_optional_field.py b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_optional_field.py index 00520e117..9e85b8440 100644 --- a/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_optional_field.py +++ b/seed/sdk/exhaustive/infinite-timeout/src/seed/types/object/object_with_optional_field.py @@ -23,7 +23,7 @@ class ObjectWithOptionalField(pydantic.BaseModel): uuid: typing.Optional[uuid.UUID] base_64: typing.Optional[str] = pydantic.Field(alias="base64") list: typing.Optional[typing.List[str]] - set: typing.Optional[typing.List[str]] + set: typing.Optional[typing.Set[str]] map: typing.Optional[typing.Dict[int, str]] def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/container/_client.py b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/container/_client.py index a2be5eada..7507a7002 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/container/_client.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/endpoints/container/_client.py @@ -64,10 +64,10 @@ def get_and_return_list_of_objects( raise ApiError(status_code=_response.status_code, body=_response.text) raise ApiError(status_code=_response.status_code, body=_response_json) - def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typing.List[str]: + def get_and_return_set_of_primitives(self, *, request: typing.Set[str]) -> typing.Set[str]: """ Parameters: - - request: typing.List[str]. + - request: typing.Set[str]. """ _response = self._client_wrapper.httpx_client.request( "POST", @@ -77,7 +77,7 @@ def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typi timeout=60, ) if 200 <= _response.status_code < 300: - return pydantic.parse_obj_as(typing.List[str], _response.json()) # type: ignore + return pydantic.parse_obj_as(typing.Set[str], _response.json()) # type: ignore try: _response_json = _response.json() except JSONDecodeError: @@ -217,10 +217,10 @@ async def get_and_return_list_of_objects( raise ApiError(status_code=_response.status_code, body=_response.text) raise ApiError(status_code=_response.status_code, body=_response_json) - async def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typing.List[str]: + async def get_and_return_set_of_primitives(self, *, request: typing.Set[str]) -> typing.Set[str]: """ Parameters: - - request: typing.List[str]. + - request: typing.Set[str]. """ _response = await self._client_wrapper.httpx_client.request( "POST", @@ -230,7 +230,7 @@ async def get_and_return_set_of_primitives(self, *, request: typing.List[str]) - timeout=60, ) if 200 <= _response.status_code < 300: - return pydantic.parse_obj_as(typing.List[str], _response.json()) # type: ignore + return pydantic.parse_obj_as(typing.Set[str], _response.json()) # type: ignore try: _response_json = _response.json() except JSONDecodeError: diff --git a/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_optional_field.py b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_optional_field.py index 00520e117..9e85b8440 100644 --- a/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_optional_field.py +++ b/seed/sdk/exhaustive/no-custom-config/src/seed/types/object/object_with_optional_field.py @@ -23,7 +23,7 @@ class ObjectWithOptionalField(pydantic.BaseModel): uuid: typing.Optional[uuid.UUID] base_64: typing.Optional[str] = pydantic.Field(alias="base64") list: typing.Optional[typing.List[str]] - set: typing.Optional[typing.List[str]] + set: typing.Optional[typing.Set[str]] map: typing.Optional[typing.Dict[int, str]] def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/container/_client.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/container/_client.py index a2be5eada..7507a7002 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/container/_client.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/endpoints/container/_client.py @@ -64,10 +64,10 @@ def get_and_return_list_of_objects( raise ApiError(status_code=_response.status_code, body=_response.text) raise ApiError(status_code=_response.status_code, body=_response_json) - def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typing.List[str]: + def get_and_return_set_of_primitives(self, *, request: typing.Set[str]) -> typing.Set[str]: """ Parameters: - - request: typing.List[str]. + - request: typing.Set[str]. """ _response = self._client_wrapper.httpx_client.request( "POST", @@ -77,7 +77,7 @@ def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typi timeout=60, ) if 200 <= _response.status_code < 300: - return pydantic.parse_obj_as(typing.List[str], _response.json()) # type: ignore + return pydantic.parse_obj_as(typing.Set[str], _response.json()) # type: ignore try: _response_json = _response.json() except JSONDecodeError: @@ -217,10 +217,10 @@ async def get_and_return_list_of_objects( raise ApiError(status_code=_response.status_code, body=_response.text) raise ApiError(status_code=_response.status_code, body=_response_json) - async def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typing.List[str]: + async def get_and_return_set_of_primitives(self, *, request: typing.Set[str]) -> typing.Set[str]: """ Parameters: - - request: typing.List[str]. + - request: typing.Set[str]. """ _response = await self._client_wrapper.httpx_client.request( "POST", @@ -230,7 +230,7 @@ async def get_and_return_set_of_primitives(self, *, request: typing.List[str]) - timeout=60, ) if 200 <= _response.status_code < 300: - return pydantic.parse_obj_as(typing.List[str], _response.json()) # type: ignore + return pydantic.parse_obj_as(typing.Set[str], _response.json()) # type: ignore try: _response_json = _response.json() except JSONDecodeError: diff --git a/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_optional_field.py b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_optional_field.py index f5cba5087..36a8716ac 100644 --- a/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_optional_field.py +++ b/seed/sdk/exhaustive/pydantic-v1/src/seed/types/object/object_with_optional_field.py @@ -20,7 +20,7 @@ class ObjectWithOptionalField(pydantic.BaseModel): uuid: typing.Optional[uuid.UUID] base_64: typing.Optional[str] = pydantic.Field(alias="base64") list: typing.Optional[typing.List[str]] - set: typing.Optional[typing.List[str]] + set: typing.Optional[typing.Set[str]] map: typing.Optional[typing.Dict[int, str]] def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/sdk/exhaustive/union-utils/src/seed/endpoints/container/_client.py b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/container/_client.py index a2be5eada..7507a7002 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/endpoints/container/_client.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/endpoints/container/_client.py @@ -64,10 +64,10 @@ def get_and_return_list_of_objects( raise ApiError(status_code=_response.status_code, body=_response.text) raise ApiError(status_code=_response.status_code, body=_response_json) - def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typing.List[str]: + def get_and_return_set_of_primitives(self, *, request: typing.Set[str]) -> typing.Set[str]: """ Parameters: - - request: typing.List[str]. + - request: typing.Set[str]. """ _response = self._client_wrapper.httpx_client.request( "POST", @@ -77,7 +77,7 @@ def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typi timeout=60, ) if 200 <= _response.status_code < 300: - return pydantic.parse_obj_as(typing.List[str], _response.json()) # type: ignore + return pydantic.parse_obj_as(typing.Set[str], _response.json()) # type: ignore try: _response_json = _response.json() except JSONDecodeError: @@ -217,10 +217,10 @@ async def get_and_return_list_of_objects( raise ApiError(status_code=_response.status_code, body=_response.text) raise ApiError(status_code=_response.status_code, body=_response_json) - async def get_and_return_set_of_primitives(self, *, request: typing.List[str]) -> typing.List[str]: + async def get_and_return_set_of_primitives(self, *, request: typing.Set[str]) -> typing.Set[str]: """ Parameters: - - request: typing.List[str]. + - request: typing.Set[str]. """ _response = await self._client_wrapper.httpx_client.request( "POST", @@ -230,7 +230,7 @@ async def get_and_return_set_of_primitives(self, *, request: typing.List[str]) - timeout=60, ) if 200 <= _response.status_code < 300: - return pydantic.parse_obj_as(typing.List[str], _response.json()) # type: ignore + return pydantic.parse_obj_as(typing.Set[str], _response.json()) # type: ignore try: _response_json = _response.json() except JSONDecodeError: diff --git a/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_optional_field.py b/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_optional_field.py index 00520e117..9e85b8440 100644 --- a/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_optional_field.py +++ b/seed/sdk/exhaustive/union-utils/src/seed/types/object/object_with_optional_field.py @@ -23,7 +23,7 @@ class ObjectWithOptionalField(pydantic.BaseModel): uuid: typing.Optional[uuid.UUID] base_64: typing.Optional[str] = pydantic.Field(alias="base64") list: typing.Optional[typing.List[str]] - set: typing.Optional[typing.List[str]] + set: typing.Optional[typing.Set[str]] map: typing.Optional[typing.Dict[int, str]] def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/sdk/file-upload/src/seed/service/_client.py b/seed/sdk/file-upload/src/seed/service/_client.py index c0d9c4008..33cfd3211 100644 --- a/seed/sdk/file-upload/src/seed/service/_client.py +++ b/seed/sdk/file-upload/src/seed/service/_client.py @@ -28,9 +28,9 @@ def post( maybe_file: typing.IO, maybe_integer: typing.Optional[int] = None, list_of_strings: typing.List[str], - set_of_strings: typing.List[str], + set_of_strings: typing.Set[str], optional_list_of_strings: typing.Optional[typing.List[str]] = None, - optional_set_of_strings: typing.Optional[typing.List[str]] = None, + optional_set_of_strings: typing.Optional[typing.Set[str]] = None, maybe_list: MaybeList, optional_maybe_list: typing.Optional[MaybeList] = None, maybe_list_or_set: MaybeListOrSet, @@ -51,11 +51,11 @@ def post( - list_of_strings: typing.List[str]. - - set_of_strings: typing.List[str]. + - set_of_strings: typing.Set[str]. - optional_list_of_strings: typing.Optional[typing.List[str]]. - - optional_set_of_strings: typing.Optional[typing.List[str]]. + - optional_set_of_strings: typing.Optional[typing.Set[str]]. - maybe_list: MaybeList. @@ -133,9 +133,9 @@ async def post( maybe_file: typing.IO, maybe_integer: typing.Optional[int] = None, list_of_strings: typing.List[str], - set_of_strings: typing.List[str], + set_of_strings: typing.Set[str], optional_list_of_strings: typing.Optional[typing.List[str]] = None, - optional_set_of_strings: typing.Optional[typing.List[str]] = None, + optional_set_of_strings: typing.Optional[typing.Set[str]] = None, maybe_list: MaybeList, optional_maybe_list: typing.Optional[MaybeList] = None, maybe_list_or_set: MaybeListOrSet, @@ -156,11 +156,11 @@ async def post( - list_of_strings: typing.List[str]. - - set_of_strings: typing.List[str]. + - set_of_strings: typing.Set[str]. - optional_list_of_strings: typing.Optional[typing.List[str]]. - - optional_set_of_strings: typing.Optional[typing.List[str]]. + - optional_set_of_strings: typing.Optional[typing.Set[str]]. - maybe_list: MaybeList. diff --git a/seed/sdk/file-upload/src/seed/service/maybe_list_or_set.py b/seed/sdk/file-upload/src/seed/service/maybe_list_or_set.py index efd075d2f..0cbc77211 100644 --- a/seed/sdk/file-upload/src/seed/service/maybe_list_or_set.py +++ b/seed/sdk/file-upload/src/seed/service/maybe_list_or_set.py @@ -3,5 +3,5 @@ import typing MaybeListOrSet = typing.Union[ - str, typing.List[str], int, typing.List[int], typing.List[typing.List[int]], typing.List[str] + str, typing.List[str], int, typing.List[int], typing.List[typing.List[int]], typing.Set[str] ] diff --git a/seed/sdk/object/src/seed/type.py b/seed/sdk/object/src/seed/type.py index a07256bc4..d2e590708 100644 --- a/seed/sdk/object/src/seed/type.py +++ b/seed/sdk/object/src/seed/type.py @@ -73,7 +73,7 @@ class Type(pydantic.BaseModel): eight: uuid.UUID nine: str ten: typing.List[int] - eleven: typing.List[float] + eleven: typing.Set[float] twelve: typing.Dict[str, bool] thirteen: typing.Optional[int] fourteen: typing.Any diff --git a/src/fern_python/generators/context/type_reference_to_type_hint_converter.py b/src/fern_python/generators/context/type_reference_to_type_hint_converter.py index 8220baed9..1a33d0cd9 100644 --- a/src/fern_python/generators/context/type_reference_to_type_hint_converter.py +++ b/src/fern_python/generators/context/type_reference_to_type_hint_converter.py @@ -51,11 +51,25 @@ def _get_type_hint_for_container( ), ), # Fern sets become Pydanic lists, since Pydantic models aren't hashable - set=lambda wrapped_type: AST.TypeHint.list( - self.get_type_hint_for_type_reference( - type_reference=wrapped_type, - must_import_after_current_declaration=must_import_after_current_declaration, - ) + set=lambda wrapped_type: wrapped_type.visit( + container=lambda type_reference: AST.TypeHint.list( + self._get_type_hint_for_container( + container=type_reference, + must_import_after_current_declaration=must_import_after_current_declaration, + ) + ), + named=lambda type_reference: AST.TypeHint.list( + self._get_type_hint_for_named( + type_name=type_reference, + must_import_after_current_declaration=must_import_after_current_declaration, + ) + ), + primitive=lambda type_reference: AST.TypeHint.set( + self._get_type_hint_for_primitive( + primitive=type_reference, + ) + ), + unknown=lambda: AST.TypeHint.list(AST.TypeHint.any()), ), optional=lambda wrapped_type: AST.TypeHint.optional( self.get_type_hint_for_type_reference( From ea09c463336e2fdfee620d64baa50b8c78bc2a23 Mon Sep 17 00:00:00 2001 From: Armando Belardo <11140328+armandobelardo@users.noreply.github.com> Date: Tue, 19 Dec 2023 17:59:34 -0500 Subject: [PATCH 6/6] [fix] also ensure that aliased primatives can become sets as well (#470) * Allow for making sets * fix types in visitor * seed tests * run seed again but bumped v * other seed tests * add fastapi tests too... * factor in the use of primative aliases * fix primative aliases --- .../types/create_problem_request_v_2.py | 2 +- .../v_2/problem/types/problem_info_v_2.py | 2 +- .../types/create_problem_request_v_2.py | 2 +- .../v_2/v_3/problem/types/problem_info_v_2.py | 2 +- .../problem/create_problem_request_v_2.py | 2 +- .../v_2/resources/problem/problem_info_v_2.py | 2 +- .../problem/create_problem_request_v_2.py | 2 +- .../v_3/resources/problem/problem_info_v_2.py | 2 +- .../v_2/problem/create_problem_request_v_2.py | 2 +- .../src/seed/v_2/problem/problem_info_v_2.py | 2 +- .../v_3/problem/create_problem_request_v_2.py | 2 +- .../seed/v_2/v_3/problem/problem_info_v_2.py | 2 +- .../pydantic_generator_context_impl.py | 2 +- .../type_reference_to_type_hint_converter.py | 43 +++++++++++++++---- 14 files changed, 47 insertions(+), 22 deletions(-) diff --git a/seed/fastapi/trace/v_2/problem/types/create_problem_request_v_2.py b/seed/fastapi/trace/v_2/problem/types/create_problem_request_v_2.py index 21725bb52..7c307b1d4 100644 --- a/seed/fastapi/trace/v_2/problem/types/create_problem_request_v_2.py +++ b/seed/fastapi/trace/v_2/problem/types/create_problem_request_v_2.py @@ -22,7 +22,7 @@ class CreateProblemRequestV2(pydantic.BaseModel): custom_files: CustomFiles = pydantic.Field(alias="customFiles") custom_test_case_templates: typing.List[TestCaseTemplate] = pydantic.Field(alias="customTestCaseTemplates") testcases: typing.List[TestCaseV2] - supported_languages: typing.List[Language] = pydantic.Field(alias="supportedLanguages") + supported_languages: typing.Set[Language] = pydantic.Field(alias="supportedLanguages") is_public: bool = pydantic.Field(alias="isPublic") def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/fastapi/trace/v_2/problem/types/problem_info_v_2.py b/seed/fastapi/trace/v_2/problem/types/problem_info_v_2.py index 162d2c1f8..e56985c4c 100644 --- a/seed/fastapi/trace/v_2/problem/types/problem_info_v_2.py +++ b/seed/fastapi/trace/v_2/problem/types/problem_info_v_2.py @@ -23,7 +23,7 @@ class ProblemInfoV2(pydantic.BaseModel): problem_description: ProblemDescription = pydantic.Field(alias="problemDescription") problem_name: str = pydantic.Field(alias="problemName") problem_version: int = pydantic.Field(alias="problemVersion") - supported_languages: typing.List[Language] = pydantic.Field(alias="supportedLanguages") + supported_languages: typing.Set[Language] = pydantic.Field(alias="supportedLanguages") custom_files: CustomFiles = pydantic.Field(alias="customFiles") generated_files: GeneratedFiles = pydantic.Field(alias="generatedFiles") custom_test_case_templates: typing.List[TestCaseTemplate] = pydantic.Field(alias="customTestCaseTemplates") diff --git a/seed/fastapi/trace/v_2/v_3/problem/types/create_problem_request_v_2.py b/seed/fastapi/trace/v_2/v_3/problem/types/create_problem_request_v_2.py index ede8824fd..8a1944739 100644 --- a/seed/fastapi/trace/v_2/v_3/problem/types/create_problem_request_v_2.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/create_problem_request_v_2.py @@ -22,7 +22,7 @@ class CreateProblemRequestV2(pydantic.BaseModel): custom_files: CustomFiles = pydantic.Field(alias="customFiles") custom_test_case_templates: typing.List[TestCaseTemplate] = pydantic.Field(alias="customTestCaseTemplates") testcases: typing.List[TestCaseV2] - supported_languages: typing.List[Language] = pydantic.Field(alias="supportedLanguages") + supported_languages: typing.Set[Language] = pydantic.Field(alias="supportedLanguages") is_public: bool = pydantic.Field(alias="isPublic") def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/fastapi/trace/v_2/v_3/problem/types/problem_info_v_2.py b/seed/fastapi/trace/v_2/v_3/problem/types/problem_info_v_2.py index 5f32a3687..778367e20 100644 --- a/seed/fastapi/trace/v_2/v_3/problem/types/problem_info_v_2.py +++ b/seed/fastapi/trace/v_2/v_3/problem/types/problem_info_v_2.py @@ -23,7 +23,7 @@ class ProblemInfoV2(pydantic.BaseModel): problem_description: ProblemDescription = pydantic.Field(alias="problemDescription") problem_name: str = pydantic.Field(alias="problemName") problem_version: int = pydantic.Field(alias="problemVersion") - supported_languages: typing.List[Language] = pydantic.Field(alias="supportedLanguages") + supported_languages: typing.Set[Language] = pydantic.Field(alias="supportedLanguages") custom_files: CustomFiles = pydantic.Field(alias="customFiles") generated_files: GeneratedFiles = pydantic.Field(alias="generatedFiles") custom_test_case_templates: typing.List[TestCaseTemplate] = pydantic.Field(alias="customTestCaseTemplates") diff --git a/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/problem/create_problem_request_v_2.py b/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/problem/create_problem_request_v_2.py index 8d8909815..a6f7a341e 100644 --- a/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/problem/create_problem_request_v_2.py +++ b/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/problem/create_problem_request_v_2.py @@ -22,7 +22,7 @@ class CreateProblemRequestV2(pydantic.BaseModel): custom_files: CustomFiles = pydantic.Field(alias="customFiles") custom_test_case_templates: typing.List[TestCaseTemplate] = pydantic.Field(alias="customTestCaseTemplates") testcases: typing.List[TestCaseV2] - supported_languages: typing.List[Language] = pydantic.Field(alias="supportedLanguages") + supported_languages: typing.Set[Language] = pydantic.Field(alias="supportedLanguages") is_public: bool = pydantic.Field(alias="isPublic") def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/problem/problem_info_v_2.py b/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/problem/problem_info_v_2.py index 5ea740531..6a203a362 100644 --- a/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/problem/problem_info_v_2.py +++ b/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/problem/problem_info_v_2.py @@ -23,7 +23,7 @@ class ProblemInfoV2(pydantic.BaseModel): problem_description: ProblemDescription = pydantic.Field(alias="problemDescription") problem_name: str = pydantic.Field(alias="problemName") problem_version: int = pydantic.Field(alias="problemVersion") - supported_languages: typing.List[Language] = pydantic.Field(alias="supportedLanguages") + supported_languages: typing.Set[Language] = pydantic.Field(alias="supportedLanguages") custom_files: CustomFiles = pydantic.Field(alias="customFiles") generated_files: GeneratedFiles = pydantic.Field(alias="generatedFiles") custom_test_case_templates: typing.List[TestCaseTemplate] = pydantic.Field(alias="customTestCaseTemplates") diff --git a/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/v_3/resources/problem/create_problem_request_v_2.py b/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/v_3/resources/problem/create_problem_request_v_2.py index 25fb85949..c062a7b9b 100644 --- a/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/v_3/resources/problem/create_problem_request_v_2.py +++ b/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/v_3/resources/problem/create_problem_request_v_2.py @@ -22,7 +22,7 @@ class CreateProblemRequestV2(pydantic.BaseModel): custom_files: CustomFiles = pydantic.Field(alias="customFiles") custom_test_case_templates: typing.List[TestCaseTemplate] = pydantic.Field(alias="customTestCaseTemplates") testcases: typing.List[TestCaseV2] - supported_languages: typing.List[Language] = pydantic.Field(alias="supportedLanguages") + supported_languages: typing.Set[Language] = pydantic.Field(alias="supportedLanguages") is_public: bool = pydantic.Field(alias="isPublic") def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/v_3/resources/problem/problem_info_v_2.py b/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/v_3/resources/problem/problem_info_v_2.py index afb3fefea..6cddb8b64 100644 --- a/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/v_3/resources/problem/problem_info_v_2.py +++ b/seed/pydantic/trace/src/seed/trace/resources/v_2/resources/v_3/resources/problem/problem_info_v_2.py @@ -23,7 +23,7 @@ class ProblemInfoV2(pydantic.BaseModel): problem_description: ProblemDescription = pydantic.Field(alias="problemDescription") problem_name: str = pydantic.Field(alias="problemName") problem_version: int = pydantic.Field(alias="problemVersion") - supported_languages: typing.List[Language] = pydantic.Field(alias="supportedLanguages") + supported_languages: typing.Set[Language] = pydantic.Field(alias="supportedLanguages") custom_files: CustomFiles = pydantic.Field(alias="customFiles") generated_files: GeneratedFiles = pydantic.Field(alias="generatedFiles") custom_test_case_templates: typing.List[TestCaseTemplate] = pydantic.Field(alias="customTestCaseTemplates") diff --git a/seed/sdk/trace/src/seed/v_2/problem/create_problem_request_v_2.py b/seed/sdk/trace/src/seed/v_2/problem/create_problem_request_v_2.py index bd555a3ca..5a66228cb 100644 --- a/seed/sdk/trace/src/seed/v_2/problem/create_problem_request_v_2.py +++ b/seed/sdk/trace/src/seed/v_2/problem/create_problem_request_v_2.py @@ -22,7 +22,7 @@ class CreateProblemRequestV2(pydantic.BaseModel): custom_files: CustomFiles = pydantic.Field(alias="customFiles") custom_test_case_templates: typing.List[TestCaseTemplate] = pydantic.Field(alias="customTestCaseTemplates") testcases: typing.List[TestCaseV2] - supported_languages: typing.List[Language] = pydantic.Field(alias="supportedLanguages") + supported_languages: typing.Set[Language] = pydantic.Field(alias="supportedLanguages") is_public: bool = pydantic.Field(alias="isPublic") def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/sdk/trace/src/seed/v_2/problem/problem_info_v_2.py b/seed/sdk/trace/src/seed/v_2/problem/problem_info_v_2.py index aa1204d34..16732347c 100644 --- a/seed/sdk/trace/src/seed/v_2/problem/problem_info_v_2.py +++ b/seed/sdk/trace/src/seed/v_2/problem/problem_info_v_2.py @@ -23,7 +23,7 @@ class ProblemInfoV2(pydantic.BaseModel): problem_description: ProblemDescription = pydantic.Field(alias="problemDescription") problem_name: str = pydantic.Field(alias="problemName") problem_version: int = pydantic.Field(alias="problemVersion") - supported_languages: typing.List[Language] = pydantic.Field(alias="supportedLanguages") + supported_languages: typing.Set[Language] = pydantic.Field(alias="supportedLanguages") custom_files: CustomFiles = pydantic.Field(alias="customFiles") generated_files: GeneratedFiles = pydantic.Field(alias="generatedFiles") custom_test_case_templates: typing.List[TestCaseTemplate] = pydantic.Field(alias="customTestCaseTemplates") diff --git a/seed/sdk/trace/src/seed/v_2/v_3/problem/create_problem_request_v_2.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/create_problem_request_v_2.py index 50d9516f3..c91ba470f 100644 --- a/seed/sdk/trace/src/seed/v_2/v_3/problem/create_problem_request_v_2.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/create_problem_request_v_2.py @@ -22,7 +22,7 @@ class CreateProblemRequestV2(pydantic.BaseModel): custom_files: CustomFiles = pydantic.Field(alias="customFiles") custom_test_case_templates: typing.List[TestCaseTemplate] = pydantic.Field(alias="customTestCaseTemplates") testcases: typing.List[TestCaseV2] - supported_languages: typing.List[Language] = pydantic.Field(alias="supportedLanguages") + supported_languages: typing.Set[Language] = pydantic.Field(alias="supportedLanguages") is_public: bool = pydantic.Field(alias="isPublic") def json(self, **kwargs: typing.Any) -> str: diff --git a/seed/sdk/trace/src/seed/v_2/v_3/problem/problem_info_v_2.py b/seed/sdk/trace/src/seed/v_2/v_3/problem/problem_info_v_2.py index 29ea183a1..50cbbbfc8 100644 --- a/seed/sdk/trace/src/seed/v_2/v_3/problem/problem_info_v_2.py +++ b/seed/sdk/trace/src/seed/v_2/v_3/problem/problem_info_v_2.py @@ -23,7 +23,7 @@ class ProblemInfoV2(pydantic.BaseModel): problem_description: ProblemDescription = pydantic.Field(alias="problemDescription") problem_name: str = pydantic.Field(alias="problemName") problem_version: int = pydantic.Field(alias="problemVersion") - supported_languages: typing.List[Language] = pydantic.Field(alias="supportedLanguages") + supported_languages: typing.Set[Language] = pydantic.Field(alias="supportedLanguages") custom_files: CustomFiles = pydantic.Field(alias="customFiles") generated_files: GeneratedFiles = pydantic.Field(alias="generatedFiles") custom_test_case_templates: typing.List[TestCaseTemplate] = pydantic.Field(alias="customTestCaseTemplates") diff --git a/src/fern_python/generators/context/pydantic_generator_context_impl.py b/src/fern_python/generators/context/pydantic_generator_context_impl.py index e743aa100..7849e6f67 100644 --- a/src/fern_python/generators/context/pydantic_generator_context_impl.py +++ b/src/fern_python/generators/context/pydantic_generator_context_impl.py @@ -20,7 +20,7 @@ def __init__( ): super().__init__(ir=ir, generator_config=generator_config) self._type_reference_to_type_hint_converter = TypeReferenceToTypeHintConverter( - type_declaration_referencer=type_declaration_referencer, + type_declaration_referencer=type_declaration_referencer, context=self ) self._type_declaration_referencer = type_declaration_referencer self._project_module_path = project_module_path diff --git a/src/fern_python/generators/context/type_reference_to_type_hint_converter.py b/src/fern_python/generators/context/type_reference_to_type_hint_converter.py index 1a33d0cd9..892cceb2e 100644 --- a/src/fern_python/generators/context/type_reference_to_type_hint_converter.py +++ b/src/fern_python/generators/context/type_reference_to_type_hint_converter.py @@ -5,9 +5,16 @@ from fern_python.codegen import AST from fern_python.declaration_referencer import AbstractDeclarationReferencer +from .pydantic_generator_context import PydanticGeneratorContext + class TypeReferenceToTypeHintConverter: - def __init__(self, type_declaration_referencer: AbstractDeclarationReferencer[ir_types.DeclaredTypeName]): + def __init__( + self, + type_declaration_referencer: AbstractDeclarationReferencer[ir_types.DeclaredTypeName], + context: PydanticGeneratorContext, + ): + self._context = context self._type_declaration_referencer = type_declaration_referencer def get_type_hint_for_type_reference( @@ -28,6 +35,28 @@ def get_type_hint_for_type_reference( unknown=AST.TypeHint.any, ) + def _get_set_type_hint_for_named( + self, + name: ir_types.DeclaredTypeName, + must_import_after_current_declaration: Optional[Callable[[ir_types.DeclaredTypeName], bool]], + ) -> AST.TypeHint: + is_primative = self._context.get_declaration_for_type_id(name.type_id).shape.visit( + alias=lambda alias_td: alias_td.resolved_type.visit( + container=lambda c: False, named=lambda n: False, primitive=lambda p: True, unknown=lambda: False + ), + enum=lambda enum_td: True, + object=lambda object_td: False, + union=lambda union_td: False, + undiscriminated_union=lambda union_td: False, + ) + inner_hint = self._get_type_hint_for_named( + type_name=name, + must_import_after_current_declaration=must_import_after_current_declaration, + ) + if is_primative: + return AST.TypeHint.set(inner_hint) + return AST.TypeHint.list(inner_hint) + def _get_type_hint_for_container( self, container: ir_types.ContainerType, @@ -58,16 +87,12 @@ def _get_type_hint_for_container( must_import_after_current_declaration=must_import_after_current_declaration, ) ), - named=lambda type_reference: AST.TypeHint.list( - self._get_type_hint_for_named( - type_name=type_reference, - must_import_after_current_declaration=must_import_after_current_declaration, - ) + named=lambda type_reference: self._get_set_type_hint_for_named( + type_reference, + must_import_after_current_declaration=must_import_after_current_declaration, ), primitive=lambda type_reference: AST.TypeHint.set( - self._get_type_hint_for_primitive( - primitive=type_reference, - ) + self._get_type_hint_for_primitive(primitive=type_reference) ), unknown=lambda: AST.TypeHint.list(AST.TypeHint.any()), ),