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

Squashed commit of the following: #53

Merged
merged 5 commits into from
Nov 8, 2024
Merged

Squashed commit of the following: #53

merged 5 commits into from
Nov 8, 2024

Conversation

kefeimo
Copy link
Contributor

@kefeimo kefeimo commented Oct 31, 2024

commit e06f125
Author: Kefei Mo [email protected]
Date: Thu Oct 31 10:20:15 2024 -0500

clean-up

commit 23e0856
Author: Kefei Mo [email protected]
Date: Tue Oct 29 20:40:01 2024 -0500

needs to run the tests separately.

commit 58f44ef
Author: Kefei Mo [email protected]
Date: Tue Oct 29 18:00:43 2024 -0500

flaky tests watch out

commit 5fddd62
Author: Kefei Mo [email protected]
Date: Tue Oct 29 17:28:56 2024 -0500

fixed result_master = master_new.soe_handler.db

commit 5b899e1
Author: Kefei Mo [email protected]
Date: Tue Oct 29 16:52:03 2024 -0500

manually fixed connection error

commit c766646
Author: Kefei Mo [email protected]
Date: Tue Oct 29 15:23:17 2024 -0500

cleaned up

commit 214ef87
Author: Kefei Mo [email protected]
Date: Tue Oct 29 14:44:27 2024 -0500

refactored to use station_application

commit 5c49385
Author: Kefei Mo [email protected]
Date: Tue Oct 29 12:10:33 2024 -0500

refactored to use outstation_app

commit 644c0d0
Author: Kefei Mo [email protected]
Date: Mon Oct 28 16:51:50 2024 -0500

from __future__ import annotations

commit 5a8108e
Author: Kefei Mo [email protected]
Date: Mon Oct 28 16:28:59 2024 -0500

improved print out db as a screenshot

commit 0513cc1
Author: Kefei Mo [email protected]
Date: Mon Oct 28 12:19:56 2024 -0500

refactored dnp3station, testing, db size, dnp3demo

commit e28bb34
Author: Kefei Mo [email protected]
Date: Mon Oct 28 11:18:59 2024 -0500

added testing outstation.

commit ca1e2d3
Author: Kefei Mo [email protected]
Date: Thu Oct 24 14:10:03 2024 -0500

pybind11 roll back

commit 1914a5d
Author: Kefei Mo [email protected]
Date: Thu Oct 24 14:05:55 2024 -0500

independent github workflow

commit aa57fad
Author: Kefei Mo [email protected]
Date: Thu Oct 24 13:53:04 2024 -0500

optimized github action workflow

commit 0ce490c
Author: Kefei Mo [email protected]
Date: Thu Oct 24 13:46:06 2024 -0500

added "pip install pytest"

commit 9eb6438
Author: Kefei Mo [email protected]
Date: Thu Oct 24 13:38:51 2024 -0500

rename

commit 2f54a28
Author: Kefei Mo [email protected]
Date: Thu Oct 24 13:34:57 2024 -0500

pytest -s -vv /tests/test_dnp3_python/*

commit 7c6292d
Author: Kefei Mo [email protected]
Date: Thu Oct 24 13:28:08 2024 -0500

added

commit 6f6b2b2
Author: Kefei Mo [email protected]
Date: Thu Oct 24 13:26:05 2024 -0500

added test_master

commit 3e4f049
Author: Kefei Mo [email protected]
Date: Wed Oct 23 16:44:56 2024 -0500

added fixture testing

commit fe6699f
Author: Kefei Mo [email protected]
Date: Wed Oct 23 13:55:18 2024 -0500

modified install-package.yml

commit 5ce38de
Author: Kefei Mo [email protected]
Date: Wed Oct 23 13:48:23 2024 -0500

fiexed 3.10 considered as 3.1 in github action

commit 3782b47
Author: Kefei Mo [email protected]
Date: Wed Oct 23 13:45:00 2024 -0500

added Install Package Test for github action

commit 2fe0c2b
Author: Kefei Mo [email protected]
Date: Wed Oct 23 13:38:01 2024 -0500

added test_insatllation, added __version__

commit 29590af
Author: Kefei Mo [email protected]
Date: Wed Oct 23 11:21:34 2024 -0500

rebase from v0.2.3b10

commit 1617afc
Author: Kefei Mo [email protected]
Date: Wed Sep 18 15:33:53 2024 -0500

adding new OutStationApplication class for beter usability

commit 1a1fda2
Author: Kefei Mo [email protected]
Date: Wed Aug 21 16:57:44 2024 -0500

added notes to ScanAllObjects to improve readability

commit dd534a8
Author: Kefei Mo [email protected]
Date: Wed Aug 21 14:14:35 2024 -0500

added example for Measure(value, flags, dnp3time) in data_retrieval_demo

commit 270637c
Author: Kefei Mo [email protected]
Date: Mon Aug 12 09:56:13 2024 -0500

added notebook

commit 97780a0
Author: Kefei Mo [email protected]
Date: Wed Aug 7 17:21:36 2024 -0500

mapped to pnnl database schema

commit 9c6888a
Author: Kefei Mo [email protected]
Date: Wed Aug 7 13:28:29 2024 -0500

added cmd sub-command to allow config db sizes.

commit e06f125
Author: Kefei Mo <[email protected]>
Date:   Thu Oct 31 10:20:15 2024 -0500

    clean-up

commit 23e0856
Author: Kefei Mo <[email protected]>
Date:   Tue Oct 29 20:40:01 2024 -0500

    needs to run the tests separately.

commit 58f44ef
Author: Kefei Mo <[email protected]>
Date:   Tue Oct 29 18:00:43 2024 -0500

    flaky tests watch out

commit 5fddd62
Author: Kefei Mo <[email protected]>
Date:   Tue Oct 29 17:28:56 2024 -0500

    fixed result_master = master_new.soe_handler.db

commit 5b899e1
Author: Kefei Mo <[email protected]>
Date:   Tue Oct 29 16:52:03 2024 -0500

    manually fixed connection error

commit c766646
Author: Kefei Mo <[email protected]>
Date:   Tue Oct 29 15:23:17 2024 -0500

    cleaned up

commit 214ef87
Author: Kefei Mo <[email protected]>
Date:   Tue Oct 29 14:44:27 2024 -0500

    refactored to use station_application

commit 5c49385
Author: Kefei Mo <[email protected]>
Date:   Tue Oct 29 12:10:33 2024 -0500

    refactored to use outstation_app

commit 644c0d0
Author: Kefei Mo <[email protected]>
Date:   Mon Oct 28 16:51:50 2024 -0500

    from __future__ import annotations

commit 5a8108e
Author: Kefei Mo <[email protected]>
Date:   Mon Oct 28 16:28:59 2024 -0500

    improved print out db as a screenshot

commit 0513cc1
Author: Kefei Mo <[email protected]>
Date:   Mon Oct 28 12:19:56 2024 -0500

    refactored dnp3station, testing, db size, dnp3demo

commit e28bb34
Author: Kefei Mo <[email protected]>
Date:   Mon Oct 28 11:18:59 2024 -0500

    added testing outstation.

commit ca1e2d3
Author: Kefei Mo <[email protected]>
Date:   Thu Oct 24 14:10:03 2024 -0500

    pybind11 roll back

commit 1914a5d
Author: Kefei Mo <[email protected]>
Date:   Thu Oct 24 14:05:55 2024 -0500

    independent github workflow

commit aa57fad
Author: Kefei Mo <[email protected]>
Date:   Thu Oct 24 13:53:04 2024 -0500

    optimized github action workflow

commit 0ce490c
Author: Kefei Mo <[email protected]>
Date:   Thu Oct 24 13:46:06 2024 -0500

    added "pip install pytest"

commit 9eb6438
Author: Kefei Mo <[email protected]>
Date:   Thu Oct 24 13:38:51 2024 -0500

    rename

commit 2f54a28
Author: Kefei Mo <[email protected]>
Date:   Thu Oct 24 13:34:57 2024 -0500

    pytest -s -vv /tests/test_dnp3_python/*

commit 7c6292d
Author: Kefei Mo <[email protected]>
Date:   Thu Oct 24 13:28:08 2024 -0500

    added

commit 6f6b2b2
Author: Kefei Mo <[email protected]>
Date:   Thu Oct 24 13:26:05 2024 -0500

    added test_master

commit 3e4f049
Author: Kefei Mo <[email protected]>
Date:   Wed Oct 23 16:44:56 2024 -0500

    added fixture testing

commit fe6699f
Author: Kefei Mo <[email protected]>
Date:   Wed Oct 23 13:55:18 2024 -0500

    modified install-package.yml

commit 5ce38de
Author: Kefei Mo <[email protected]>
Date:   Wed Oct 23 13:48:23 2024 -0500

    fiexed 3.10 considered as 3.1 in github action

commit 3782b47
Author: Kefei Mo <[email protected]>
Date:   Wed Oct 23 13:45:00 2024 -0500

    added Install Package Test for github action

commit 2fe0c2b
Author: Kefei Mo <[email protected]>
Date:   Wed Oct 23 13:38:01 2024 -0500

    added test_insatllation, added __version__

commit 29590af
Author: Kefei Mo <[email protected]>
Date:   Wed Oct 23 11:21:34 2024 -0500

    rebase from v0.2.3b10

commit 1617afc
Author: Kefei Mo <[email protected]>
Date:   Wed Sep 18 15:33:53 2024 -0500

    adding new OutStationApplication class for beter usability

commit 1a1fda2
Author: Kefei Mo <[email protected]>
Date:   Wed Aug 21 16:57:44 2024 -0500

    added notes to ScanAllObjects to improve readability

commit dd534a8
Author: Kefei Mo <[email protected]>
Date:   Wed Aug 21 14:14:35 2024 -0500

    added example for Measure(value, flags, dnp3time) in data_retrieval_demo

commit 270637c
Author: Kefei Mo <[email protected]>
Date:   Mon Aug 12 09:56:13 2024 -0500

    added notebook

commit 97780a0
Author: Kefei Mo <[email protected]>
Date:   Wed Aug 7 17:21:36 2024 -0500

    mapped to pnnl database schema

commit 9c6888a
Author: Kefei Mo <[email protected]>
Date:   Wed Aug 7 13:28:29 2024 -0500

    added cmd sub-command to allow config db sizes.
@kefeimo kefeimo requested a review from craig8 October 31, 2024 15:22
@kefeimo kefeimo self-assigned this Oct 31, 2024
src/dnp3_python/dnp3station/outstation.py Outdated Show resolved Hide resolved
@kefeimo kefeimo requested a review from craig8 November 4, 2024 20:44
@craig8
Copy link
Contributor

craig8 commented Nov 4, 2024

To pass what type hint checking thing? I think it is much more readable to leave the str without the | None and update your type hinting to ignore the None.

All things could be None and require that that is checked, regardless of what is passed right?

@kefeimo
Copy link
Contributor Author

kefeimo commented Nov 4, 2024

To pass what type hint checking thing? I think it is much more readable to leave the str without the | None and update your type hinting to ignore the None.

All things could be None and require that that is checked, regardless of what is passed right?

Make sense. Modified accordingly with polished cmd parse input

@@ -535,3 +579,252 @@ def to_flat_db(db: dict) -> dict:
db_flat["Value"] += values
db_flat["Type"] += types
return db_flat


# def to_pnnl_schema(db: dict, is_wrapped_text=True) -> pd.DataFrame:
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we remove all of this commented out code to clean this up?

@craig8
Copy link
Contributor

craig8 commented Nov 8, 2024

@kefeimo these tests run I assume on your system. The tests won't run since they are new until this goes to the default (main) branch.

@craig8 craig8 merged commit 7f88618 into VOLTTRON:develop Nov 8, 2024
3 of 4 checks passed
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.

2 participants