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

Refactor + Include missing .it content #81

Merged
merged 3 commits into from
Jan 30, 2024
Merged

Refactor + Include missing .it content #81

merged 3 commits into from
Jan 30, 2024

Conversation

fivegrant
Copy link
Contributor

This fixes #80 and also refactors the decapodes directory to be more usable and readable. I tested Contexts and Configurations with Pydantic and they worked fine.

Trying to get this merged as soon as possible because it's needed for the simulation services and HMI integration

Issues

  • The model InterType seems to be out of sync with the example Decapode. That's out of my wheelhouse so I'll defer to you @jpfairbanks and @olynch .
    • This may be an issue with main as well. I have not tested the model
    • The above issue also breaks SimulationPlan
  • JSON Schema validates for any JSON: I think this is going to be an issue as people try to integrate against the spec.

@fivegrant fivegrant changed the title Reinclude configs and contexts and refactor Refactor + Include missing .it content Jan 26, 2024
@fivegrant
Copy link
Contributor Author

I just tested main and the above issues I outlined above are not unique to this PR. I think we should go ahead and merge this, but if if you'd like to include fixes for the model intertype I'm fine with that as well

@fivegrant fivegrant marked this pull request as ready for review January 29, 2024 19:21
Copy link
Collaborator

@jpfairbanks jpfairbanks left a comment

Choose a reason for hiding this comment

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

Just some small things like using joinpath and fixing indentation.

decapodes/generate.jl Outdated Show resolved Hide resolved
decapodes/generate.jl Outdated Show resolved Hide resolved
decapodes/intertypes/context.it Show resolved Hide resolved
decapodes/python/model.py Outdated Show resolved Hide resolved
@jpfairbanks jpfairbanks merged commit a08dbff into main Jan 30, 2024
6 checks passed
@jpfairbanks jpfairbanks deleted the fix/missing-it branch January 30, 2024 18:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

InterTypes for Configuration and Context got lost in Merge conflicts.
2 participants