Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automatically supply scenario path to Envision server #1806

Merged
merged 14 commits into from
Jan 26, 2023
Merged

Automatically supply scenario path to Envision server #1806

merged 14 commits into from
Jan 26, 2023

Conversation

Adaickalavan
Copy link
Member

@Adaickalavan Adaickalavan self-assigned this Jan 25, 2023
@Adaickalavan Adaickalavan linked an issue Jan 25, 2023 that may be closed by this pull request
Avoid manually specifying scenario path to Envision server #1625
Closed
Gamenot
Gamenot approved these changes Jan 25, 2023
View reviewed changes
CHANGELOG.md Outdated
@@ -11,6 +11,7 @@ Copy and pasting the git commit messages is __NOT__ enough.
## [Unreleased]
### Added
### Changed
- Scenario paths need not be supplied manually to Envision server while setup. Scenario paths are automatically sent to Envision server from SMARTS during simulation startup phase.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not quite the case.

Suggested change
- Scenario paths need not be supplied manually to Envision server while setup. Scenario paths are automatically sent to Envision server from SMARTS during simulation startup phase.
- Scenario paths is no longer manually supplied to Envision server while setup. Scenario paths are automatically sent to Envision server from SMARTS during simulation startup phase.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have changed it.

@Adaickalavan Adaickalavan merged commit e337e23 into develop Jan 26, 2023
@Adaickalavan Adaickalavan deleted the scenario-path branch January 26, 2023 14:58
qianyi-sun added a commit that referenced this pull request Feb 7, 2023
@qianyi-sun @Gamenot
@Adaickalavan @saulfield
bugfixes for running examples with scenarios (#1825)
fa978cb 
* GitHub Actions: Update cli.rst

* Fix `open-agent` setup error. (#1785)

* Fix import error by moving version information to resource file.

* Update readme.

* GitHub Actions: Update requirements.txt

* Reorganize examples (#1784)

* Removed trainer folder. (#1787)

* Fix issues preventing minicity from working. (#1788)

* GitHub Actions: Update requirements.txt

* GitHub Actions: Update mac_requirements.txt

* Remove observation_adapter, action_adapter, reward_adapter, and info_adapter from HiWayEnv (#1779)

* GitHub Actions: Update requirements.txt

* Move dataset generator tool (#1782)

* GitHub Actions: Update requirements.txt

* GitHub Actions: Update mac_requirements.txt

* Performance metrics - normalized, recomputed, overall score (#1772)

* GitHub Actions: Update requirements.txt

* Encapsulate traci connection utility.

* Retry connection persistently if process is alive.

* Update CHANGELOG.md

* Fix doctest.

* Fix for python3.7

* Make format.

* Fix case where traci_conn is not set up.

* Fix error where sumo process is None.

* Clean up sumo traffic simulation class.

* Fix route finding bug.

* Attempt another fix at connection

* Optimize connection check.

* Fix formatting

* Support up to SUMO 1.15.0

* Update changelog.

* Fix type errors

* Loosen sumo version

* Fix minimum sumo version

* Remove SUMO home test.

* Use partition instead of split to prevent errors.

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* Fix issues that occur when exceptions are thrown

* Move sleep out of utility.

* Raise exception still.

* Try optimization

* Improve the code quality.

* GitHub Actions: Update requirements.txt

* Envision map fix (#1790)

* Use scenario root for map file hash in envision

* Update envision/server.py

Co-authored-by: adai <adaickalavan@gmail.com>

Co-authored-by: adai <adaickalavan@gmail.com>

* GitHub Actions: Update mac_requirements.txt

* CI test for performance metrics (#1778)

* GitHub Actions: Update requirements.txt

* GitHub Actions: Format

* Fix notebook env

* Revert "Remove unused utility."

This reverts commit e5e3c48.

* Add local version

* Update error with more information

* Delete create_run_visualize.py

* GitHub Actions: Update requirements.txt

* GitHub Actions: Format

* GitHub Actions: Update mac_requirements.txt

* Add road lines to RGB image observations (#1796)

* Add roadlines to rgb observation

* Save roadlines as glbs

* Type fix

* GitHub Actions: Update requirements.txt

* GitHub Actions: Format

* Revamped documentation (#1792)

* GitHub Actions: Update requirements.txt

* GitHub Actions: Format

* Add base environment

* Close to a working environment.

* Simplify format_obs changes.

* Update original environments to support upgrades.

* Update documentation.

* Use class instead of assignment.

* Fix name of attribute.

* Update an example.

* Large update of variable names.

* Fix leftover warning.

* Fix multi-line string.

* Restore format obs conversion.

* Fix new action.

* Add conversion utility.

* Add missing header.

* Add observation space to HiWayV1 and comp env.

* Update metrics.

* Update examples.

* Add missing interface for road map route.

* Standardize observation formatter names.

* Revert most format obs changes.

* Move the gymnasium environments and utilities.

* Remove unused imports.

* Update test examples.

* Fix string warning.

* Fix rewards return for hiway-v1.

* Fix gymnasium warnings.

* make format

* Update resource loading.

* Benchmark

* Add worker logging to benchmark.

* Add observation space demo to benchmark.

* Comment on necessary improvements to observations.

* Update observations.

* Make format.

* Make goals immutable

* Add module substitution utility.

* Add `scl benchmark` utilities.

* Remove template types in strings.

* Update Makefile

Co-authored-by: adai <adaickalavan@gmail.com>

* Apply suggestion that truncated is set if policy fails.

* Fix documentation for RelativeTargetPose.

* Add `Score` object for metrics.

* Revert package resources distribution version.

* Fix spelling error.

* Remove pylint error suppression.

* Fix symantics error.

* Fix key changes in format obs test.

* Update test single agent keys.

* make format.

* Add agent action type configuration and limit TargetPose.

* Fix key error in format obs test.

* Fix rgb image test parameterization issue.

* Hook up seed to the hiway-env environment.

* Move action space resolution to competition env.

* remove multi_scenario environment.

* Refactor out multiple inheritance from observation converters.

* Configure hiway env observation space options.

* Update hiway env configuration.

* Move agent config.

* Disable env check in gym registration.

* Remove redundant assignment.

* Remove needless type check.

* Fix dictionary unpack.

* Clearly warn that offroad causes completion penalties.

* Mention why completion was penalized.

* Cache space value.

* Set mission to old location in gym observations.

* Rename hiway env v1 example.

* Add an api adaptor for gymnasium to gym<=0.21.

* Allow old gym wrappers to work with gymnasium.

* Allow more wrappers to work with new gymnasium env.

* Make format

* Condense imports.

* Constrain the relative target pose speed to 28mps.

* Remove EpisodeLimit wrapper.

* Add missing sstudio import.

* Make relative target pose the default action.

* Clean up comments.

* Update the action space docstring.

* Fix the speed cap for relative target pose.

* Fix issues with rebase.

* Update hiway env v1 example.

* Fix rebase issues.

* Renamed camera_pos to camera_position.

* Set api reversion to be a gym wrapper instead.

* Remove useless examples.

* Revert marl benchmark changes.

* Fill out auto-install

* Rename benchmark example agent.

* Document hiway env v1.

* Fix test observations.

* Remove useless docstring.

* Rename competition metrics back to metrics.

* Add hiway-env-v1 to the environment documentation.

* Set dynamic number of cpus for benchmark runner.

* Add error tolerance configuration.

* Make worker logging explicit.

* Fix cpu affinity check

* Add hiway_v1 to example tests.

* Fix sanity-test

* Fix format obs.

* Update metrics test.

* Fix rgb image test.

* Finish writing docstrings and scl help.

* Fix pytype complaint.

* Make format.

* Revert rl racing example.

* Fix pytype.

* Fix sanity test

* Fix issues with benchmark utility.

* Fix pytype errors.

* Fix docstring test.

* Touch up interface.

* Allow leaving out benchmark version.

* Add benchmark documentation.

* Update changelog.

* GitHub Actions: Update requirements.txt

* Update SMARTS version to 1.0.0

* Fix documentation errors.

* GitHub Actions: Update requirements.txt

* GitHub Actions: Update mac_requirements.txt

* Fix small issues with benchmark. (#1802)

* Fix small issues with benchmark.

* Update change log.

* GitHub Actions: Update requirements.txt

* Make sure server serves correct map glb file (#1804)

* Fix waypoint observations for offline dataset generation (#1807)

* Add missions to history vehicles with sensors. Other fixes.

* Test fixes

* Test fixes

* Update smarts/core/traffic_history.py

Co-authored-by: adai <adaickalavan@gmail.com>

Co-authored-by: adai <adaickalavan@gmail.com>

* GitHub Actions: Update requirements.txt

* Automatically supply scenario path to Envision server (#1806)

* GitHub Actions: Update requirements.txt

* GitHub Actions: Format

* Change metrics to use info["env_obs"].

* Make format.

* Fix type test.

* Change default instead assert.

* Update smarts/env/gymnasium/wrappers/metric/completion.py

Co-authored-by: adai <adaickalavan@gmail.com>

* Fix detach call.

* Ensure hiway-v0 agent interfaces are populated.

* Update changelog.

* GitHub Actions: Update requirements.txt

* Add action space formatting for hiway-v1.

* Update changelog.

* Fix issues with action conversion.

* Rename observation formatter to match action.

* Add header.

* Update license date.

* Fix docstring test.

* Update smarts/env/gymnasium/utils/action_conversion.py

Co-authored-by: Saul Field <saul.field@gmail.com>

* Update docstrings..

* Compare action keys instead of space check.

* Use key comparision instead of set cast.

* Reduce observation formatting class use.

* Fix observation description.

* Further shrink the number of classes.

* Hide internal parameter.

* Add unformatted option to hiway-v1 observation configuration.

* Update changelog.

* Update smarts/core/controllers/__init__.py

Co-authored-by: adai <adaickalavan@gmail.com>

* GitHub Actions: Update requirements.txt

* Bump version to 1.0.2

* Move scenario construction (#1815)

* GitHub Actions: Format

* GitHub Actions: Update mac_requirements.txt

* 'from tools' -> 'from example.tools'

* minor

* Fix issue with unformatted metrics (#1821)

* Fix issue with metrics

* Remove redundant check.

* Fix action and observation documentation. (#1823)

* GitHub Actions: Update requirements.txt

* Fix hiway-v1 unformatted observation options (#1822)

* Fix issue with metrics

* Remove redundant check.

* Fix minor issues with environments.

* Fix test.

* Update CHANGELOG.md

Co-authored-by: Saul Field <saul.field@gmail.com>

---------

Co-authored-by: Saul Field <saul.field@gmail.com>

* Add an option for serial run of benchmark. (#1831)

* Add an option for serial run of benchmark.

* Fix types test.

* Fix error message dump. (#1827)

* Fix error message dump.

* Update changelog.

* Fix type test.

* Fix formatting.

* GitHub Actions: Update requirements.txt

* Bump version 1.0.2 -> 1.0.3

* GitHub Actions: Update mac_requirements.txt

* change as suggested

* Update examples/control/laner.py

Co-authored-by: Tucker Alban <montgomery.alban@huawei.com>

* Update examples/control/laner.py

Co-authored-by: Tucker Alban <montgomery.alban@huawei.com>

* Update examples/control/chase_via_points.py

Co-authored-by: Tucker Alban <montgomery.alban@huawei.com>

* Update examples/control/laner.py

Co-authored-by: Tucker Alban <montgomery.alban@huawei.com>

* Update examples/control/chase_via_points.py

Co-authored-by: Tucker Alban <montgomery.alban@huawei.com>

* Update examples/control/chase_via_points.py

Co-authored-by: Tucker Alban <montgomery.alban@huawei.com>

---------

Co-authored-by: Qianyi Sun <qianyi-sun@users.noreply.github.com>
Co-authored-by: Tucker Alban <montgomery.alban@huawei.com>
Co-authored-by: Tucker Alban <mtuck2005@yahoo.ca>
Co-authored-by: adai <adaickalavan@gmail.com>
Co-authored-by: Saul Field <saul.field@gmail.com>
Co-authored-by: Saul Field <saulfield@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Gamenot Gamenot Gamenot approved these changes

@saulfield saulfield Awaiting requested review from saulfield

@qianyi-sun qianyi-sun Awaiting requested review from qianyi-sun

Assignees

@Adaickalavan Adaickalavan

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Avoid manually specifying scenario path to Envision server
2 participants
@Adaickalavan @Gamenot