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.

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

1196 add dose to medium and let to medium #1233

Merged
merged 17 commits into from
Oct 11, 2023

Conversation

Derstilon
Copy link
Member

@Derstilon Derstilon commented Sep 28, 2023

requires yaptide/converter#149 to be merged

@Derstilon Derstilon linked an issue Sep 28, 2023 that may be closed by this pull request
@Derstilon Derstilon marked this pull request as draft September 28, 2023 16:23
@Derstilon Derstilon force-pushed the 1196-add-dose-to-medium-and-let-to-medium branch 3 times, most recently from 0ef4b7b to acc8b0a Compare October 2, 2023 16:28
@grzanka
Copy link
Contributor

grzanka commented Oct 3, 2023

Duplication of Quantities stopped working on this branch:

1196.add.dose.to.medium.and.let.to.medium.by.Derstilon.Pull.Request.1233.yaptide_ui.-.Google.Chrome.2023-10-03.22-31-17.mp4

It is working perfectly well on the main branch on github pages deploy:

Proton.broad.beam.58.MeV.in.water.-.Google.Chrome.2023-10-03.22-30-04.mp4

@Derstilon Derstilon temporarily deployed to github-pages October 6, 2023 16:08 — with GitHub Actions Inactive
@Derstilon Derstilon temporarily deployed to github-pages October 6, 2023 17:51 — with GitHub Actions Inactive
@grzanka
Copy link
Contributor

grzanka commented Oct 6, 2023

When running the simulation I get an error from backend:

2023-10-06 21:02:52 INFO:werkzeug:172.21.0.6 - - [06/Oct/2023 19:02:52] "OPTIONS /jobs/direct HTTP/1.0" 200 -
2023-10-06 21:02:52 INFO:werkzeug:172.21.0.6 - - [06/Oct/2023 19:02:52] "POST /jobs/direct HTTP/1.0" 500 -
2023-10-06 21:02:52 Traceback (most recent call last):
2023-10-06 21:02:52   File "/usr/local/lib/python3.10/site-packages/flask/app.py", line 2213, in __call__
2023-10-06 21:02:52     return self.wsgi_app(environ, start_response)
2023-10-06 21:02:52   File "/usr/local/lib/python3.10/site-packages/flask/app.py", line 2193, in wsgi_app
2023-10-06 21:02:52     response = self.handle_exception(e)
2023-10-06 21:02:52   File "/usr/local/lib/python3.10/site-packages/flask_restful/__init__.py", line 298, in error_router
2023-10-06 21:02:52     return original_handler(e)
2023-10-06 21:02:52   File "/usr/local/lib/python3.10/site-packages/flask/app.py", line 2190, in wsgi_app
2023-10-06 21:02:52     response = self.full_dispatch_request()
2023-10-06 21:02:52   File "/usr/local/lib/python3.10/site-packages/flask/app.py", line 1486, in full_dispatch_request
2023-10-06 21:02:52     rv = self.handle_user_exception(e)
2023-10-06 21:02:52   File "/usr/local/lib/python3.10/site-packages/flask_restful/__init__.py", line 298, in error_router
2023-10-06 21:02:52     return original_handler(e)
2023-10-06 21:02:52   File "/usr/local/lib/python3.10/site-packages/flask/app.py", line 1484, in full_dispatch_request
2023-10-06 21:02:52     rv = self.dispatch_request()
2023-10-06 21:02:52   File "/usr/local/lib/python3.10/site-packages/flask/app.py", line 1469, in dispatch_request
2023-10-06 21:02:52     return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args)
2023-10-06 21:02:52   File "/usr/local/lib/python3.10/site-packages/flask_restful/__init__.py", line 489, in wrapper
2023-10-06 21:02:52     resp = resource(*args, **kwargs)
2023-10-06 21:02:52   File "/usr/local/lib/python3.10/site-packages/flask/views.py", line 109, in view
2023-10-06 21:02:52     return current_app.ensure_sync(self.dispatch_request)(**kwargs)
2023-10-06 21:02:52   File "/usr/local/lib/python3.10/site-packages/flask_restful/__init__.py", line 604, in dispatch_request
2023-10-06 21:02:52     resp = meth(*args, **kwargs)
2023-10-06 21:02:52   File "/usr/local/app/yaptide/routes/utils/decorators.py", line 24, in wrapper
2023-10-06 21:02:52     return f(user, *args, **kwargs)
2023-10-06 21:02:52   File "/usr/local/app/yaptide/routes/celery_routes.py", line 79, in post
2023-10-06 21:02:52     files_dict, number_of_all_primaries = files_dict_with_adjusted_primaries(payload_dict=payload_dict)
2023-10-06 21:02:52   File "/usr/local/app/yaptide/utils/sim_utils.py", line 145, in files_dict_with_adjusted_primaries
2023-10-06 21:02:52     return check_and_convert_payload_to_files_dict(new_payload_dict), number_of_all_primaries
2023-10-06 21:02:52   File "/usr/local/app/yaptide/utils/sim_utils.py", line 75, in check_and_convert_payload_to_files_dict
2023-10-06 21:02:52     files_dict = convert_editor_dict_to_files_dict(editor_dict=payload_dict["input_json"],
2023-10-06 21:02:52   File "/usr/local/app/yaptide/utils/sim_utils.py", line 63, in convert_editor_dict_to_files_dict
2023-10-06 21:02:52     files_dict = run_parser(parser=conv_parser, input_data=editor_dict)
2023-10-06 21:02:52   File "/usr/local/app/yaptide/converter/converter/api.py", line 28, in run_parser
2023-10-06 21:02:52     parser.parse_configs(input_data)
2023-10-06 21:02:52   File "/usr/local/app/yaptide/converter/converter/shieldhit/parser.py", line 30, in parse_configs
2023-10-06 21:02:52     self._parse_geo_mat(json)
2023-10-06 21:02:52   File "/usr/local/app/yaptide/converter/converter/shieldhit/parser.py", line 309, in _parse_geo_mat
2023-10-06 21:02:52     self._parse_materials(json)
2023-10-06 21:02:52   File "/usr/local/app/yaptide/converter/converter/shieldhit/parser.py", line 320, in _parse_materials
2023-10-06 21:02:52     self.geo_mat_config.materials = [
2023-10-06 21:02:52   File "/usr/local/app/yaptide/converter/converter/shieldhit/parser.py", line 321, in <listcomp>
2023-10-06 21:02:52     Material(material["name"], material["sanitizedName"], material["uuid"], material["icru"])
2023-10-06 21:02:52 KeyError: 'sanitizedName'
2023-10-06 21:03:38 INFO:werkzeug:172.21.0.6

On the other hand pyodide converter works well:

image

@Derstilon Derstilon temporarily deployed to github-pages October 6, 2023 19:25 — with GitHub Actions Inactive
@Derstilon Derstilon temporarily deployed to github-pages October 8, 2023 10:23 — with GitHub Actions Inactive
@Derstilon Derstilon temporarily deployed to github-pages October 8, 2023 10:24 — with GitHub Actions Inactive
@Derstilon Derstilon temporarily deployed to github-pages October 8, 2023 10:39 — with GitHub Actions Inactive
@grzanka
Copy link
Contributor

grzanka commented Oct 8, 2023

Is it still draft or ready for review?

@Derstilon Derstilon temporarily deployed to github-pages October 8, 2023 15:56 — with GitHub Actions Inactive
@grzanka
Copy link
Contributor

grzanka commented Oct 8, 2023

Can you update examples and bump examples version to 0.11 ? Otherwise I see

image

@grzanka
Copy link
Contributor

grzanka commented Oct 8, 2023

Converter changes are merged now, maybe you could update the converter in this PR as well and fix the tests ?

@grzanka grzanka added EuroHPC features created within EuroHPC project feature labels Oct 8, 2023
@grzanka grzanka added this to the 2023 December milestone Oct 8, 2023
@Derstilon Derstilon temporarily deployed to github-pages October 9, 2023 15:01 — with GitHub Actions Inactive
@Derstilon Derstilon temporarily deployed to github-pages October 9, 2023 15:08 — with GitHub Actions Inactive
@Derstilon Derstilon marked this pull request as ready for review October 9, 2023 15:21
@Derstilon
Copy link
Member Author

Is it still draft or ready for review?

I've merged new converter and change status to ready

@grzanka
Copy link
Contributor

grzanka commented Oct 9, 2023

Is it still draft or ready for review?

I've merged new converter and change status to ready

OK, I will check it.

@grzanka
Copy link
Contributor

grzanka commented Oct 9, 2023

@Derstilon take a look as well at yaptide/yaptide#639
I think that example JSON files in backend test suite needs update as well

@grzanka grzanka requested a review from ostatni5 October 9, 2023 16:45
grzanka
grzanka previously approved these changes Oct 9, 2023
Copy link
Contributor

@grzanka grzanka left a comment

Choose a reason for hiding this comment

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

OK

@Derstilon Derstilon temporarily deployed to github-pages October 11, 2023 14:55 — with GitHub Actions Inactive
Copy link
Contributor

@grzanka grzanka left a comment

Choose a reason for hiding this comment

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

Needs yaptide/yaptide#639 to be merged first

@grzanka grzanka added this pull request to the merge queue Oct 11, 2023
Merged via the queue into master with commit 8a39a44 Oct 11, 2023
5 checks passed
@grzanka grzanka deleted the 1196-add-dose-to-medium-and-let-to-medium branch October 11, 2023 15:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
EuroHPC features created within EuroHPC project feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add dose-to-medium and LET-to-medium
3 participants