jessicamillar commented 2 years ago

This is a proposal for a first step to moving the dna out of houses.json

Two immediate issues:

I didn't quite get the tests running - test_config and conftest need to be updated
This conflicts with your most recent. When I tried to merge, for some reason I was getting errors with the fragment_runner. So I am momentarily tossing my hands up in the air on that in the interests of you being able to look at this

Two medium issues:

It would be nice to get rid of setting self.settings.dna = json.loads(settings.dna_type) as a required step in creating the actor. But I can't seem to get the json.loads to work in, for example, config.
The dna is right now just a dictionary. It needs to become the gw_tuple of a schema with a lot of validation and checking of the structure (i.e. that the Components correspond to component dataclasses, that the set of SpaceHeat node aliases form a tree, etc)

codecov[bot] commented 2 years ago

Codecov Report

Merging #116 (afda40e) into main (75854cc) will increase coverage by 0.29%. The diff coverage is 93.03%.

@@            Coverage Diff             @@
##             main     #116      +/-   ##
==========================================
+ Coverage   94.09%   94.38%   +0.29%     
==========================================
  Files         219      220       +1     
  Lines       11317    11371      +54     
==========================================
+ Hits        10649    10733      +84     
+ Misses        668      638      -30

Impacted Files	Coverage Δ
gw_spaceheat/actors2/__init__.py	`100.00% <ø> (ø)`
gw_spaceheat/actors2/actor_interface.py	`70.00% <0.00%> (ø)`
gw_spaceheat/actors2/boolean_actuator.py	`94.28% <ø> (-0.16%)`	:arrow_down:
test/test_scripts.py	`37.14% <20.00%> (-1.75%)`	:arrow_down:
gw_spaceheat/command_line_utils.py	`60.81% <50.00%> (+0.53%)`	:arrow_up:
gw_spaceheat/actors2/scada_interface.py	`85.71% <80.00%> (-3.18%)`	:arrow_down:
gw_spaceheat/actors/cloud_base.py	`83.60% <83.33%> (+5.37%)`	:arrow_up:
gw_spaceheat/actors2/scada2.py	`84.73% <83.87%> (+0.29%)`	:arrow_up:
gw_spaceheat/data_classes/hardware_layout.py	`87.95% <87.95%> (ø)`
test/utils.py	`90.36% <92.30%> (ø)`
... and 38 more

:mega: We’re building smart automated test selection to slash your CI/CD build times. Learn more

anschweitzer commented 2 years ago

Replacing PR so description of the additional changes can be first comment.

thegridelectric / gw-scada-spaceheat-python

stop using houses.json and move dna into .env #116

Codecov Report