Merge common and specific code-templates #260

theory-in-progress · 2023-06-20T14:46:53Z

Description

Merge common and Specific code-templates

Modified the code in fetchTemplates so that any live updates from vue in genCode is not overwritten
Dynamically fetches the common code if the file exists, else proceeds with the code from specific file
Created new function mergeCode to merge codes from specific and common templates using ejs, the code tag being #:::- replace_here :::#
The function takes in strings of specific file and common file and returns the rendered code using ejs
The code tag is present in specific template which will be replaced with the code from common template

Feature Request

What is the purpose of this pull request?

Bug fix
New feature
Other

- Merges the common template into specific template - Uses replace in js to find the tag and replace with the common code - Uses ejs to render

- Modified the code in fetchTemplates so that any live updates from vue in genCode is not overwritten - Dynamically fetches the common code if the file exists, else proceeds with the code from specific file - Created new function mergeCode to merge codes from specific and common templates using ejs, the code tag being `#:::- replace_here :::#` - The function takes in strings of specific file and common file and returns the rendered code using ejs - The code tag is present in specific template which will be replaced with the code from common template

netlify · 2023-06-20T14:46:56Z

👷 Deploy request for code-generator pending review.

Visit the deploys page to approve it

Name	Link
🔨 Latest commit	`eb75d1d`

…mon-template - The if else statements throw an error when replace ejs code-tag is present in the specific file, but the common file is also missing in the common template - This handles the error by just replacing the replace_here tag with an empty string, since this tag is not defined for the second render

* chore(deps): bump playwright-chromium from 1.33.0 to 1.35.1 (pytorch-ignite#255) Bumps [playwright-chromium](https://github.com/Microsoft/playwright) from 1.33.0 to 1.35.1. - [Release notes](https://github.com/Microsoft/playwright/releases) - [Commits](microsoft/playwright@v1.33.0...v1.35.1) --- updated-dependencies: - dependency-name: playwright-chromium dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump semver from 7.3.5 to 7.5.2 (pytorch-ignite#254) Bumps [semver](https://github.com/npm/node-semver) from 7.3.5 to 7.5.2. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md) - [Commits](npm/node-semver@v7.3.5...v7.5.2) --- updated-dependencies: - dependency-name: semver dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: vfdev <vfdev.5@gmail.com> * chore(deps): bump ejs from 3.1.6 to 3.1.9 (pytorch-ignite#253) Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.9. - [Release notes](https://github.com/mde/ejs/releases) - [Commits](mde/ejs@v3.1.6...v3.1.9) --- updated-dependencies: - dependency-name: ejs dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump prismjs from 1.26.0 to 1.29.0 (pytorch-ignite#245) Bumps [prismjs](https://github.com/PrismJS/prism) from 1.26.0 to 1.29.0. - [Release notes](https://github.com/PrismJS/prism/releases) - [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md) - [Commits](PrismJS/prism@v1.26.0...v1.29.0) --- updated-dependencies: - dependency-name: prismjs dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * chore(deps): bump @vitejs/plugin-vue from 2.1.0 to 2.3.4 (pytorch-ignite#251) Bumps [@vitejs/plugin-vue](https://github.com/vitejs/vite-plugin-vue/tree/HEAD/packages/plugin-vue) from 2.1.0 to 2.3.4. - [Release notes](https://github.com/vitejs/vite-plugin-vue/releases) - [Changelog](https://github.com/vitejs/vite-plugin-vue/blob/main/packages/plugin-vue/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite-plugin-vue/commits/HEAD/packages/plugin-vue) --- updated-dependencies: - dependency-name: "@vitejs/plugin-vue" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: vfdev <vfdev.5@gmail.com> * Restructured config (pytorch-ignite#243) * Restructured config - Restructured config so that arguments are defined in cofing.yaml * Fix main.py * MOdified tests according to new config restructuring * Updating remaining templates with restructured config * Update according to original config args * Configs for all the templates - Created new yaml files for testing the code - These are the test args that will be run when we run the tests * Modified tests according to new config structure * Fix typo * Correct backend argument to be passed in command line * Pass backend argument as a command line argument * Modifying the config structure in template-common --------- Co-authored-by: vfdev <vfdev.5@gmail.com> * chore(deps): bump prettier from 2.5.1 to 2.8.8 (pytorch-ignite#259) Bumps [prettier](https://github.com/prettier/prettier) from 2.5.1 to 2.8.8. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](prettier/prettier@2.5.1...2.8.8) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: vfdev <vfdev.5@gmail.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: vfdev <vfdev.5@gmail.com>

src/store.js

- Removes the repeating code in the specific templates - The common code is stored in src/templates/template-common

- added min_lint - flake8 tests now run on the rendered code in dist-tests/

- We do not need the script now since the code from common and specific don't have an intersection now

…/code-generator into merge-common-specific

…_template_common ::#` handle flake import errors - Changed the code tags to match `.replace()` - handled the flake import errors by including if else statements using ejs rendering

…ports

- Making replacement globally

- Formatting

- Modified tests to check if rendered code is present and unzipped - Modified imports to include `Engine` - Modified workflow so that dir `dist-tests` are removed

src/templates/template-vision-segmentation/trainers.py

…rs.py

- added __DEV_CONFIG__.json to prettierignore - start dev server on port 5000 - add F821 non imported objects to flake8 tests - utils Formatting - trainers Formatting

vfdev-5

Thanks a lot, @theory-in-progress, LGTM!

theory-in-progress added 2 commits June 17, 2023 22:55

Added functionality for merging of common and specific templates

0f82489

- Merges the common template into specific template - Uses replace in js to find the tag and replace with the common code - Uses ejs to render

theory-in-progress and others added 4 commits June 20, 2023 20:20

Merge branch 'pytorch-ignite:main' into merge-common-specific

83f4051

Code format

463d004

vfdev-5 reviewed Jun 21, 2023

View reviewed changes

src/store.js Outdated Show resolved Hide resolved

theory-in-progress and others added 17 commits June 21, 2023 15:47

Changed code tag to from_template_common

b044f5e

Refactoring the redundant/repeating code in utils.py

bb04373

- Removes the repeating code in the specific templates - The common code is stored in src/templates/template-common

Fix lint of utils.py

5ed9d8c

Refactoring the redundant/repeating code in config.yaml

c3d1eed

- Removes the repeating code in the specific templates - The common code is stored in src/templates/template-common

Refactoring the redundant/repeating code in main.py

e474921

- Removes the repeating code in the specific templates - The common code is stored in src/templates/template-common

MOdify lint options

ac621bf

- added min_lint - flake8 tests now run on the rendered code in dist-tests/

Deleting the script check_copies.py and the command in workflow

6d9415f

- We do not need the script now since the code from common and specific don't have an intersection now

Add lint in tests and modify min_lint in lint

d9888dd

Merge branch 'main' into merge-common-specific

7703a72

Modify render with replace using js on vision-classification template

c5c9ae0

Merge branch 'merge-common-specific' of github.com:theory-in-progress…

bb5b106

…/code-generator into merge-common-specific

Install formatting tools in tests job

4f965b1

Change code tags from #:::- from_template_common :::# to `#::= from…

da90ef3

…_template_common ::#` handle flake import errors - Changed the code tags to match `.replace()` - handled the flake import errors by including if else statements using ejs rendering

Modifying trainers.py to include the if else statements for unused im…

23e2385

…ports

Removes any usort skip statements in the final code

d738012

- Making replacement globally

Added usort skip statements for certain imports in trainers.py

ff45072

- Formatting

Modified tests, imports, workflow

38c0f80

- Modified tests to check if rendered code is present and unzipped - Modified imports to include `Engine` - Modified workflow so that dir `dist-tests` are removed

vfdev-5 reviewed Jun 23, 2023

View reviewed changes

src/templates/template-vision-segmentation/trainers.py Outdated Show resolved Hide resolved

theory-in-progress added 2 commits June 23, 2023 17:12

Added type hints for functions in template-vision-segmentation/traine…

733b9ea

…rs.py

Formatting modifications

eb75d1d

- added __DEV_CONFIG__.json to prettierignore - start dev server on port 5000 - add F821 non imported objects to flake8 tests - utils Formatting - trainers Formatting

vfdev-5 approved these changes Jun 23, 2023

View reviewed changes

vfdev-5 merged commit 1915603 into pytorch-ignite:main Jun 23, 2023

guptaaryan16 mentioned this pull request Aug 17, 2023

Add common template for requirements.txt in all templates #288

Merged

3 tasks

theory-in-progress deleted the merge-common-specific branch August 29, 2023 04:47

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Merge common and specific code-templates #260

Merge common and specific code-templates #260

Uh oh!

theory-in-progress commented Jun 20, 2023

netlify bot commented Jun 20, 2023 •

edited

Loading

Uh oh!

Uh oh!

vfdev-5 left a comment

Labels

2 participants

Merge common and specific code-templates #260

Merge common and specific code-templates #260

Uh oh!

Conversation

theory-in-progress commented Jun 20, 2023

Description

What is the purpose of this pull request?

netlify bot commented Jun 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

👷 Deploy request for code-generator pending review.

Uh oh!

Uh oh!

vfdev-5 left a comment

Choose a reason for hiding this comment

Labels

2 participants

netlify bot commented Jun 20, 2023 •

edited

Loading