s2-python 0.5.0__py3-none-any.whl → 0.6.0__py3-none-any.whl

{s2_python-0.5.0.dist-info → s2_python-0.6.0.dist-info}/METADATA

@@ -1,23 +1,25 @@
 Metadata-Version: 2.4
 Name: s2-python
-Version: 0.5.0
+Version: 0.6.0
 Summary: S2 Protocol Python Wrapper
-Home-page: https://github.com/flexiblepower/s2-ws-json-python
-Author: Flexiblepower
-Author-email: info@info.nl
-License: APACHE
+Author-email: Flexiblepower <info@info.nl>
+License-Expression: Apache-2.0
+Project-URL: Source code, https://github.com/flexiblepower/s2-ws-json-python
 Platform: Linux
 Classifier: Development Status :: 4 - Beta
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Description-Content-Type: text/x-rst; charset=UTF-8
+Classifier: Programming Language :: Python :: 3.13
+Requires-Python: <3.14,>=3.9
+Description-Content-Type: text/x-rst
+License-File: LICENSE
 Requires-Dist: pydantic>=2.8.2
 Requires-Dist: pytz
 Requires-Dist: click
-Requires-Dist: websockets~=13.1
+Provides-Extra: ws
+Requires-Dist: websockets~=13.1; extra == "ws"
 Provides-Extra: testing
 Requires-Dist: pytest; extra == "testing"
 Requires-Dist: pytest-coverage; extra == "testing"
@@ -38,6 +40,7 @@ Requires-Dist: sphinx-tabs; extra == "docs"
 Requires-Dist: sphinx_copybutton; extra == "docs"
 Requires-Dist: sphinx_fontawesome; extra == "docs"
 Requires-Dist: sphinxcontrib.httpdomain; extra == "docs"
+Dynamic: license-file
 
 Python Wrapper for S2 Flexibility Protocol
 ===========================================
@@ -55,13 +58,14 @@ Currently, the package supports the *common* and *FILL RATE BASED CONTROL* types
 
 To Install
 -----------
-You can install this package using pip or any Python dependency manager that collects the packages from Pypi:
+You can install this package using pip or any Python dependency manager that collects the packages from PyPI:
 
 .. code-block:: bash
 
     pip install s2-python
+    pip install s2-python[ws]  # for S2 over WebSockets
 
-The packages on Pypi may be found `here <https://pypi.org/project/s2-python/>`_
+The packages on PyPI may be found `here <https://pypi.org/project/s2-python/>`_
 
 Mypy support
 ------------
@@ -99,7 +103,7 @@ Development
 
 For development, you can install the required dependencies using the following command:
 
-    pip install -e .[testing,development]
+    pip install -e .[testing,development,ws]
 
 
 The tests can be run using tox:

{s2_python-0.5.0.dist-info → s2_python-0.6.0.dist-info}/RECORD

@@ -1,11 +1,12 @@
+s2_python-0.6.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
 s2python/__init__.py,sha256=e5lwvqsPl-z7IfEd0hRQhLBRKBYcuw2eqrecXnMfLdg,384
-s2python/message.py,sha256=Ql0Aj9pjkhKa8eYe2o78B48zAI5oqAPUsqNz_yp5k-s,3127
+s2python/message.py,sha256=62DtKyfovcDM4Eroc33i72ZnQScWDV7sUvYifagXcmI,3352
 s2python/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 s2python/reception_status_awaiter.py,sha256=jKMliFk1XxwsEGtx3vFESbJhUtClB7cTu-td90-qBN8,2137
-s2python/s2_connection.py,sha256=DNn27sE5IVQvkxPBVWnRB6CMf6NiEG1ftGyuBJWe9z0,21062
-s2python/s2_control_type.py,sha256=-Rwz2emQkk4hL20GvfWN90Iu1rxBT_DBIQ38uuMrxcs,3281
-s2python/s2_parser.py,sha256=BBwSFMXz5Ut-aGqiVQCurlr4T_VZiB31dmWzAudmat8,4340
-s2python/s2_validation_error.py,sha256=BkOLoNsrcQ3MzdCYaPDgs1Wu6lPdlQDpZsTpykKGQmE,384
+s2python/s2_connection.py,sha256=QGpYtIxoRXIKeiw-1C7MywxxLwT1OwwqMxUVZ-NJ79Y,21685
+s2python/s2_control_type.py,sha256=uLZb_7l2mmqY6tJk3KuQYGpKRnZaDyLZ-E8YvAGFCwQ,4192
+s2python/s2_parser.py,sha256=uYR-8yTzqyf7xerX7ULk6prm7_Cc5h_2EC9CGCKHIJM,4583
+s2python/s2_validation_error.py,sha256=paWJAkmjOwigeFmF8Zwo-5ithRJ2SRqOLX-rHRZ6ces,398
 s2python/utils.py,sha256=QX9b-mi-H_YUGTmGmJsrAbaWWM3dgaoaRLRXHHlaZDE,212
 s2python/validate_values_mixin.py,sha256=AsycGNUjH9oMAYdOXgJR1QelyNEiM31Cp0HpBzenMxU,2539
 s2python/version.py,sha256=IBzoytgbYYYekQnSTfSmWeYAZ4c_yUFU2oLIAG4UYjs,45
@@ -14,12 +15,12 @@ s2python/common/duration.py,sha256=7u2SF7rWtwLfehD9RUiY1Mhntnah1ctvYjin04ZiYnI,7
 s2python/common/handshake.py,sha256=1S7WaonNztCkwiWNuOtQyDufimGXuD-2vmnqrJ9UOzU,489
 s2python/common/handshake_response.py,sha256=aJyZSl62wUUdtrJ4WFzu4ZIlhl-4wjxdyQ7rnaa3oNI,537
 s2python/common/instruction_status_update.py,sha256=z1nt5ToXinuX44N-t-w5oCYXQtG27q9QZEsg1xsISwY,735
-s2python/common/number_range.py,sha256=VZiFlIUzDyWu5UrSnNqmzT5umIt9mjJiYaFeMX8WWgE,726
+s2python/common/number_range.py,sha256=twkIKKtSHtxb4eegwPaDSIGRDWzHAH3gm5t3SPbIyfo,739
 s2python/common/power_forecast.py,sha256=XXtRJWeHDa-mkr4FnHrN55Fp_byBmTLsaAQKqO7Zcpo,757
-s2python/common/power_forecast_element.py,sha256=cONUwv9gJEQLmxgKPHu9Qto1wm5GCITe-au8RlkmMd4,870
+s2python/common/power_forecast_element.py,sha256=Uy0dOe6Lo_WEswS8pHHZXSeC5UnrrwpYb8R7NENNUKQ,1606
 s2python/common/power_forecast_value.py,sha256=-tIGJn1ME4ozVmg1jdoEWUYT4Eb5uxvp443TmJpmBB0,389
-s2python/common/power_measurement.py,sha256=EMfy6sPeo9f55yjvKhhN8gz5KTWk9RI4Z8qzevib-M8,743
-s2python/common/power_range.py,sha256=dz27VZJPE6-3Ubo1vPRX5FG1sGVIjjENJ7aySM2cV6A,672
+s2python/common/power_measurement.py,sha256=4c6OEIG9-75M9aiqmvUUWMwGkAkQEVGRcVvi_Iz6mlk,1486
+s2python/common/power_range.py,sha256=zb8Juw9WtV-UvkICRIO6LGvCt19eqErryKoQe2S3Kog,702
 s2python/common/power_value.py,sha256=mjHEPWFzMAZPJ0P5M9zASHf5uIW47kM8SqqdVaZCkAs,349
 s2python/common/reception_status.py,sha256=Lf6c81jq5VWUTFgGmmTUly3PK82MmRrt4n6T3zdG-aA,541
 s2python/common/resource_manager_details.py,sha256=-t4sOlVrlAzFaokb3d_94QUxQr1FeQlRJghVjMJxodM,1158
@@ -40,14 +41,14 @@ s2python/ddbc/ddbc_operation_mode.py,sha256=JuIcWod2vdUqCdECS7WGDyA_b-q6AgNg4BU4
 s2python/ddbc/ddbc_system_description.py,sha256=FjFzAyIK119BbTIk0xaPY2beNm2lDFq3M-ELnz7TuFg,1361
 s2python/ddbc/ddbc_timer_status.py,sha256=Hvbgv4LA7pq3J_KR9E9QrMaiN9VN4M6SFJRj8VgmADc,816
 s2python/frbc/__init__.py,sha256=X2DytTb_e8R8xZaA4fc1-EkKJmleF37U5OUmNUCsfPU,1549
-s2python/frbc/frbc_actuator_description.py,sha256=xA_loJFgkcXKzGabgEI0zbgQ8E40rhbWB1lyV0MGkcE,6353
+s2python/frbc/frbc_actuator_description.py,sha256=KBpe_Df9f71FHqx4orTY0MmUfGNCv3AnCk4gUSa73-0,6445
 s2python/frbc/frbc_actuator_status.py,sha256=m7FdDC6weKiDDJPGbMqqA6zmPcInxB4Sj5_Ot1cQ6L4,1125
 s2python/frbc/frbc_fill_level_target_profile.py,sha256=bO9-J3EfKN5jb3nNlnimL01J1FHN-CgM9JTg5mX3VyI,937
-s2python/frbc/frbc_fill_level_target_profile_element.py,sha256=aJtVUnRYr2gApkQQyDNikv8hTZyOQAIivx6PpUNIFdQ,1324
+s2python/frbc/frbc_fill_level_target_profile_element.py,sha256=OeWr755qB8U5r-uleluezd69cbcwViyY9DDmRQvRaY8,1337
 s2python/frbc/frbc_instruction.py,sha256=1tC1pLXz3nw3J8ozx4fppqcOvsS4lb7uGyx2ACi9fHM,930
 s2python/frbc/frbc_leakage_behaviour.py,sha256=a8SI14m1KctQYhufXd7MxehiPajtvBCIk9Dls56x4vQ,857
-s2python/frbc/frbc_leakage_behaviour_element.py,sha256=PIREQPoA4P11BHqnRjdAnWFkikrrHoJ_p3XD4LZ7uhI,1118
-s2python/frbc/frbc_operation_mode.py,sha256=a39Cs_pe09QkzLYmsv2agsnL0DJzxQHMooNPgprn5Sg,1970
+s2python/frbc/frbc_leakage_behaviour_element.py,sha256=xYNd8EBlEoC-1yiemzRpcz0OjVRLY8KZ6DxeJ-nHrVI,1140
+s2python/frbc/frbc_operation_mode.py,sha256=4FUYS5B4-UJ8rtZqogzoZDNCUxtXumK6HUomCZUGAiA,2040
 s2python/frbc/frbc_operation_mode_element.py,sha256=Yz3xfNvEsyKSBh8NxiyQy6NGNi7zc9dXO-Lz-Q4f8Hs,1236
 s2python/frbc/frbc_storage_description.py,sha256=t0MgCuSbphSf13cfJJPir19lbs_f0qOxGSxtTpo28Sc,648
 s2python/frbc/frbc_storage_status.py,sha256=1jWMu1D8Y6s9hCmICwycGhHNKVPHBNoU7soIVPxV-iU,537
@@ -57,12 +58,18 @@ s2python/frbc/frbc_usage_forecast.py,sha256=tQFZMuYls8wvpvGRq1gzguSmLNoq6SzPAYem
 s2python/frbc/frbc_usage_forecast_element.py,sha256=l55xN8ywrX45i5IOK5gbVR7lGm6lbRPjC7aPHZcc-Sc,608
 s2python/frbc/rm.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 s2python/generated/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-s2python/generated/gen_s2.py,sha256=-l2jUe1F45R1G51_Zo8_f2vpKx9Sp436BVbop4TSqy8,63401
+s2python/generated/gen_s2.py,sha256=l1jzvXGSRa09nu6GBN8Mg4z_2HfwtY3aQeBHbmrBJFM,63431
+s2python/ombc/__init__.py,sha256=gwSNmlgU35lm4W1y-pvaP5h7urpdWhy0rUuUL16qaO4,309
+s2python/ombc/ombc_instruction.py,sha256=_my3X76uUPwDXMjqfkSLPzHQhw1eeFV54nBrFkzDqCE,944
+s2python/ombc/ombc_operation_mode.py,sha256=-jpw1ccIrV1-DkgH4pbvihheRBTDZt79l5Lsn89HAsc,856
+s2python/ombc/ombc_status.py,sha256=4SDZUYAGGYiTEo68swDo_9IrmJPfMby3aPQ9XnLzmUo,593
+s2python/ombc/ombc_system_description.py,sha256=mPUfow7sEw8uzvMRZaBNnmmHOzjFsv1CtIFCNrXAhXs,1095
+s2python/ombc/ombc_timer_status.py,sha256=qaLyY9Jl16hqoIEDR5tTuoSttMHHsRdh-AxvTgODxx0,606
 s2python/pebc/__init__.py,sha256=O8CONhsj4ZEN9bPbPPZwxvr3DxMN8HnGAwdlXVT2kA8,781
-s2python/pebc/pebc_allowed_limit_range.py,sha256=vqLfXOg8E9rO5KLTru8GODiH6akE2KLWrTQMYEkSIZM,1229
+s2python/pebc/pebc_allowed_limit_range.py,sha256=_-6cuAd2wtbe7p3WPr_8WS9BD-_mb8Nmr2oKpNdS0jo,1996
 s2python/pebc/pebc_energy_constraint.py,sha256=ZjrAQVWPJ5jfxENQ5NdR9ULHwQF6dlgOhkCUCHIwk0I,1231
 s2python/pebc/pebc_instruction.py,sha256=6aVH4qu7kDE0i9DGv6voAhglUbJTlZWN6X15-GRdXJY,1275
-s2python/pebc/pebc_power_constraints.py,sha256=5Xhsm3Uc0dO6KOyp9fFDTdKGPfNuvXz8BYDAi782XEg,1286
+s2python/pebc/pebc_power_constraints.py,sha256=wzL9crLiguUCIHKs2X8F4YiBQZBGlwU8KjBVPHyW3Gk,2997
 s2python/pebc/pebc_power_envelope.py,sha256=VjqbAcAPK0Y6MMWHqWqGedNSPm293E-RGtQDtQesZC8,965
 s2python/pebc/pebc_power_envelope_element.py,sha256=Jh6Xd_d9ZUDXsO3ZswPA792q0ETFxO7qQuMd8UNUXNQ,717
 s2python/ppbc/__init__.py,sha256=nlSgMwMC9r6Ca-91CTw49eQABtdZHXrgYoHT-2I9YDc,1061
@@ -75,8 +82,8 @@ s2python/ppbc/ppbc_power_sequence_container_status.py,sha256=KhbyqgzX2yncYT6TkHG
 s2python/ppbc/ppbc_power_sequence_element.py,sha256=AbCk4lqpBkP8ppE4gMfOGLpcC53pBIcm81fUDZp5xAM,850
 s2python/ppbc/ppbc_schedule_instruction.py,sha256=C-MUpHhUMPKebmHlT8ClpmKvtLzPgs4MAq10mVcmi6Y,1291
 s2python/ppbc/ppbc_start_interruption_instruction.py,sha256=cZndUsFhBtKAmTM89qYTF74Y_SUIy1jukn7-Zz-YLo8,1420
-s2_python-0.5.0.dist-info/METADATA,sha256=5pQe4viDShRojNuDNFDpxR4LbVXLrygO5RjBh9Ojb9Y,3638
-s2_python-0.5.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-s2_python-0.5.0.dist-info/entry_points.txt,sha256=feX-xmgJZgSe5-jxMgFKPKCJz4Ys3eQcGrsXsirNZyM,61
-s2_python-0.5.0.dist-info/top_level.txt,sha256=OLFq0oDhr77Mp-EYLEcWk5P3jvooOt4IHkTI5KYJMc8,9
-s2_python-0.5.0.dist-info/RECORD,,
+s2_python-0.6.0.dist-info/METADATA,sha256=Yn_Nam6WQGtdbU6a92XiXK7hXjzOwV8xlX4aJcbZUJ8,3814
+s2_python-0.6.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+s2_python-0.6.0.dist-info/entry_points.txt,sha256=feX-xmgJZgSe5-jxMgFKPKCJz4Ys3eQcGrsXsirNZyM,61
+s2_python-0.6.0.dist-info/top_level.txt,sha256=OLFq0oDhr77Mp-EYLEcWk5P3jvooOt4IHkTI5KYJMc8,9
+s2_python-0.6.0.dist-info/RECORD,,

{s2_python-0.5.0.dist-info → s2_python-0.6.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

s2_python-0.6.0.dist-info/licenses/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

s2python/common/number_range.py

@@ -1,6 +1,9 @@
 from typing import Any
 
-from s2python.validate_values_mixin import S2MessageComponent, catch_and_convert_exceptions
+from s2python.validate_values_mixin import (
+    S2MessageComponent,
+    catch_and_convert_exceptions,
+)
 from s2python.generated.gen_s2 import NumberRange as GenNumberRange
 
 

s2python/common/power_forecast_element.py

@@ -1,6 +1,12 @@
 from typing import List
+from typing_extensions import Self
 
-from s2python.generated.gen_s2 import PowerForecastElement as GenPowerForecastElement
+from pydantic import model_validator
+
+from s2python.generated.gen_s2 import (
+    CommodityQuantity,
+    PowerForecastElement as GenPowerForecastElement,
+)
 from s2python.validate_values_mixin import (
     catch_and_convert_exceptions,
     S2MessageComponent,
@@ -18,3 +24,19 @@ class PowerForecastElement(GenPowerForecastElement, S2MessageComponent):
     power_values: List[PowerForecastValue] = (  # type: ignore[reportIncompatibleVariableOverride]
         GenPowerForecastElement.model_fields["power_values"]  # type: ignore[assignment]
     )
+
+    @model_validator(mode="after")
+    def validate_values_at_most_one_per_commodity_quantity(self) -> Self:
+        """Validates the power measurement values to check that there is at most 1 PowerValue per CommodityQuantity."""
+
+        has_value: dict[CommodityQuantity, bool] = {}
+
+        for value in self.power_values:
+            if has_value.get(value.commodity_quantity, False):
+                raise ValueError(
+                    self,
+                    "There must be at most 1 PowerForecastValue per CommodityQuantity",
+                )
+            has_value[value.commodity_quantity] = True
+
+        return self

s2python/common/power_measurement.py

@@ -1,8 +1,13 @@
-from typing import List
 import uuid
+from typing import List
+from typing_extensions import Self
 
+from pydantic import model_validator
 from s2python.common.power_value import PowerValue
-from s2python.generated.gen_s2 import PowerMeasurement as GenPowerMeasurement
+from s2python.generated.gen_s2 import (
+    PowerMeasurement as GenPowerMeasurement,
+    CommodityQuantity,
+)
 from s2python.validate_values_mixin import (
     catch_and_convert_exceptions,
     S2MessageComponent,
@@ -16,3 +21,20 @@ class PowerMeasurement(GenPowerMeasurement, S2MessageComponent):
 
     message_id: uuid.UUID = GenPowerMeasurement.model_fields["message_id"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
     values: List[PowerValue] = GenPowerMeasurement.model_fields["values"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
+
+    @model_validator(mode="after")
+    def validate_values_at_most_one_per_commodity_quantity(self) -> Self:
+        """Validates the power measurement values to check that there is at most 1 PowerValue per CommodityQuantity."""
+
+        has_value: dict[CommodityQuantity, bool] = {}
+
+        for value in self.values:
+            if has_value.get(value.commodity_quantity, False):
+                raise ValueError(
+                    self,
+                    "The measured PowerValues must contain at most one item per CommodityQuantity.",
+                )
+
+            has_value[value.commodity_quantity] = True
+
+        return self

s2python/common/power_range.py

@@ -17,6 +17,8 @@ class PowerRange(GenPowerRange, S2MessageComponent):
     @model_validator(mode="after")
     def validate_start_end_order(self) -> Self:
         if self.start_of_range > self.end_of_range:
-            raise ValueError(self, "start_of_range should not be higher than end_of_range")
+            raise ValueError(
+                self, "start_of_range should not be higher than end_of_range"
+            )
 
         return self

s2python/frbc/frbc_actuator_description.py

@@ -61,7 +61,9 @@ class FRBCActuatorDescription(GenFRBCActuatorDescription, S2MessageComponent):
         timer: Timer
         for timer in self.timers:
             if timer.id in ids:
-                raise ValueError(self, f"Id {timer.id} was found multiple times in 'timers'.")
+                raise ValueError(
+                    self, f"Id {timer.id} was found multiple times in 'timers'."
+                )
             ids.append(timer.id)
 
         return self
@@ -113,7 +115,9 @@ class FRBCActuatorDescription(GenFRBCActuatorDescription, S2MessageComponent):
                     power_ranges_for_commodity = [
                         power_range
                         for power_range in operation_mode_element.power_ranges
-                        if commodity_has_quantity(commodity, power_range.commodity_quantity)
+                        if commodity_has_quantity(
+                            commodity, power_range.commodity_quantity
+                        )
                     ]
 
                     if len(power_ranges_for_commodity) > 1:

s2python/frbc/frbc_fill_level_target_profile_element.py

@@ -8,7 +8,10 @@ from s2python.common import Duration, NumberRange
 from s2python.generated.gen_s2 import (
     FRBCFillLevelTargetProfileElement as GenFRBCFillLevelTargetProfileElement,
 )
-from s2python.validate_values_mixin import catch_and_convert_exceptions, S2MessageComponent
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
 
 
 @catch_and_convert_exceptions

s2python/frbc/frbc_leakage_behaviour_element.py

@@ -4,8 +4,13 @@ from pydantic import model_validator
 from typing_extensions import Self
 
 from s2python.common import NumberRange
-from s2python.generated.gen_s2 import FRBCLeakageBehaviourElement as GenFRBCLeakageBehaviourElement
-from s2python.validate_values_mixin import catch_and_convert_exceptions, S2MessageComponent
+from s2python.generated.gen_s2 import (
+    FRBCLeakageBehaviourElement as GenFRBCLeakageBehaviourElement,
+)
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
 
 
 @catch_and_convert_exceptions

s2python/frbc/frbc_operation_mode.py

@@ -34,8 +34,13 @@ class FRBCOperationMode(GenFRBCOperationMode, S2MessageComponent):
         sorted_fill_level_ranges = list(elements_by_fill_level_range.keys())
         sorted_fill_level_ranges.sort(key=lambda r: r.start_of_range)
 
-        for current_fill_level_range, next_fill_level_range in pairwise(sorted_fill_level_ranges):
-            if current_fill_level_range.end_of_range != next_fill_level_range.start_of_range:
+        for current_fill_level_range, next_fill_level_range in pairwise(
+            sorted_fill_level_ranges
+        ):
+            if (
+                current_fill_level_range.end_of_range
+                != next_fill_level_range.start_of_range
+            ):
                 raise ValueError(
                     self,
                     f"Elements with fill level ranges {current_fill_level_range} and "

s2python/generated/gen_s2.py

@@ -180,6 +180,7 @@ class NumberRange(BaseModel):
 class Transition(BaseModel):
     model_config = ConfigDict(
         extra="forbid",
+        populate_by_name=True
     )
     id: ID = Field(
         ...,

s2python/message.py

@@ -38,6 +38,13 @@ from s2python.ddbc import (
     DDBCSystemDescription,
     DDBCTimerStatus,
 )
+from s2python.ombc import (
+    OMBCInstruction,
+    OMBCOperationMode,
+    OMBCTimerStatus,
+    OMBCStatus,
+    OMBCSystemDescription,
+)
 
 from s2python.pebc import (
     PEBCAllowedLimitRange,
@@ -82,6 +89,10 @@ S2Message = Union[
     FRBCSystemDescription,
     FRBCTimerStatus,
     FRBCUsageForecast,
+    OMBCSystemDescription,
+    OMBCStatus,
+    OMBCTimerStatus,
+    OMBCInstruction,
     PEBCPowerConstraints,
     PPBCEndInterruptionInstruction,
     PPBCPowerProfileDefinition,
@@ -93,7 +104,6 @@ S2Message = Union[
     SelectControlType,
     SessionRequest,
     DDBCActuatorStatus,
-    FRBCInstruction,
     PEBCEnergyConstraint,
     PEBCInstruction,
     Handshake,
@@ -115,6 +125,7 @@ S2MessageElement = Union[
     FRBCOperationModeElement,
     FRBCStorageDescription,
     FRBCUsageForecastElement,
+    OMBCOperationMode,
     PEBCAllowedLimitRange,
     PEBCPowerEnvelope,
     PEBCPowerEnvelopeElement,

s2python/ombc/__init__.py

@@ -0,0 +1,5 @@
+from s2python.ombc.ombc_instruction import OMBCInstruction
+from s2python.ombc.ombc_operation_mode import OMBCOperationMode
+from s2python.ombc.ombc_status import OMBCStatus
+from s2python.ombc.ombc_system_description import OMBCSystemDescription
+from s2python.ombc.ombc_timer_status import OMBCTimerStatus

s2python/ombc/ombc_instruction.py

@@ -0,0 +1,19 @@
+import uuid
+
+from s2python.generated.gen_s2 import OMBCInstruction as GenOMBCInstruction
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
+
+
+@catch_and_convert_exceptions
+class OMBCInstruction(GenOMBCInstruction, S2MessageComponent):
+    model_config = GenOMBCInstruction.model_config
+    model_config["validate_assignment"] = True
+
+    id: uuid.UUID = GenOMBCInstruction.model_fields["id"]  # type: ignore[assignment]
+    message_id: uuid.UUID = GenOMBCInstruction.model_fields["message_id"]  # type: ignore[assignment]
+    abnormal_condition: bool = GenOMBCInstruction.model_fields["abnormal_condition"]  # type: ignore[assignment]
+    operation_mode_factor: float = GenOMBCInstruction.model_fields["operation_mode_factor"]  # type: ignore[assignment]
+    operation_mode_id: uuid.UUID = GenOMBCInstruction.model_fields["operation_mode_id"]  # type: ignore[assignment]

s2python/ombc/ombc_operation_mode.py

@@ -0,0 +1,25 @@
+from typing import List
+import uuid
+
+from s2python.generated.gen_s2 import OMBCOperationMode as GenOMBCOperationMode
+from s2python.common.power_range import PowerRange
+
+
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
+
+
+@catch_and_convert_exceptions
+class OMBCOperationMode(GenOMBCOperationMode, S2MessageComponent):
+    model_config = GenOMBCOperationMode.model_config
+    model_config["validate_assignment"] = True
+
+    id: uuid.UUID = GenOMBCOperationMode.model_fields["id"]  # type: ignore[assignment]
+    power_ranges: List[PowerRange] = GenOMBCOperationMode.model_fields[
+        "power_ranges"
+    ]  # type: ignore[assignment]
+    abnormal_condition_only: bool = GenOMBCOperationMode.model_fields[
+        "abnormal_condition_only"
+    ]  # type: ignore[assignment]

s2python/ombc/ombc_status.py

@@ -0,0 +1,17 @@
+import uuid
+
+from s2python.generated.gen_s2 import OMBCStatus as GenOMBCStatus
+
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
+
+
+@catch_and_convert_exceptions
+class OMBCStatus(GenOMBCStatus, S2MessageComponent):
+    model_config = GenOMBCStatus.model_config
+    model_config["validate_assignment"] = True
+
+    message_id: uuid.UUID = GenOMBCStatus.model_fields["message_id"]  # type: ignore[assignment]
+    operation_mode_factor: float = GenOMBCStatus.model_fields["operation_mode_factor"]  # type: ignore[assignment]

s2python/ombc/ombc_system_description.py

@@ -0,0 +1,25 @@
+from typing import List
+import uuid
+
+from s2python.generated.gen_s2 import OMBCSystemDescription as GenOMBCSystemDescription
+from s2python.ombc.ombc_operation_mode import OMBCOperationMode
+from s2python.common.transition import Transition
+from s2python.common.timer import Timer
+
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
+
+
+@catch_and_convert_exceptions
+class OMBCSystemDescription(GenOMBCSystemDescription, S2MessageComponent):
+    model_config = GenOMBCSystemDescription.model_config
+    model_config["validate_assignment"] = True
+
+    message_id: uuid.UUID = GenOMBCSystemDescription.model_fields["message_id"]  # type: ignore[assignment]
+    operation_modes: List[OMBCOperationMode] = GenOMBCSystemDescription.model_fields[
+        "operation_modes"
+    ]  # type: ignore[assignment]
+    transitions: List[Transition] = GenOMBCSystemDescription.model_fields["transitions"]  # type: ignore[assignment]
+    timers: List[Timer] = GenOMBCSystemDescription.model_fields["timers"]  # type: ignore[assignment]

s2python/ombc/ombc_timer_status.py

@@ -0,0 +1,17 @@
+from uuid import UUID
+
+from s2python.generated.gen_s2 import OMBCTimerStatus as GenOMBCTimerStatus
+
+from s2python.validate_values_mixin import (
+    catch_and_convert_exceptions,
+    S2MessageComponent,
+)
+
+
+@catch_and_convert_exceptions
+class OMBCTimerStatus(GenOMBCTimerStatus, S2MessageComponent):
+    model_config = GenOMBCTimerStatus.model_config
+    model_config["validate_assignment"] = True
+
+    message_id: UUID = GenOMBCTimerStatus.model_fields["message_id"]  # type: ignore[assignment]
+    timer_id: UUID = GenOMBCTimerStatus.model_fields["timer_id"]  # type: ignore[assignment]

s2python/pebc/pebc_allowed_limit_range.py

@@ -1,3 +1,5 @@
+from typing_extensions import Self
+from pydantic import model_validator
 from s2python.generated.gen_s2 import (
     PEBCAllowedLimitRange as GenPEBCAllowedLimitRange,
     PEBCPowerEnvelopeLimitType as GenPEBCPowerEnvelopeLimitType,
@@ -24,3 +26,17 @@ class PEBCAllowedLimitRange(GenPEBCAllowedLimitRange, S2MessageComponent):
     abnormal_condition_only: bool = [
         GenPEBCAllowedLimitRange.model_fields["abnormal_condition_only"]  # type: ignore[assignment,reportIncompatibleVariableOverride]
     ]
+
+    @model_validator(mode="after")
+    def validate_range_boundary(self) -> Self:
+        # According to the specification "There must be at least one PEBC.AllowedLimitRange for the UPPER_LIMIT
+        # and at least one AllowedLimitRange for the LOWER_LIMIT." However for something that produces energy
+        # end_of_range=-2000 and start_of_range=0 is valid. Therefore absolute value used here.
+        if abs(self.range_boundary.start_of_range) > abs(
+            self.range_boundary.end_of_range
+        ):
+            raise ValueError(
+                self,
+                "The start of the range must be smaller or equal than the end of the range.",
+            )
+        return self

s2python/pebc/pebc_power_constraints.py

@@ -1,9 +1,14 @@
 import uuid
-from typing import List
+from typing import List, Dict, Tuple
+from typing_extensions import Self
 
+from pydantic import model_validator
+
+from s2python.common import CommodityQuantity
 from s2python.generated.gen_s2 import (
     PEBCPowerConstraints as GenPEBCPowerConstraints,
     PEBCPowerEnvelopeConsequenceType as GenPEBCPowerEnvelopeConsequenceType,
+    PEBCPowerEnvelopeLimitType,
 )
 from s2python.pebc.pebc_allowed_limit_range import PEBCAllowedLimitRange
 from s2python.validate_values_mixin import (
@@ -25,3 +30,48 @@ class PEBCPowerConstraints(GenPEBCPowerConstraints, S2MessageComponent):
     allowed_limit_ranges: List[PEBCAllowedLimitRange] = GenPEBCPowerConstraints.model_fields[  # type: ignore[reportIncompatibleVariableOverride]
         "allowed_limit_ranges"
     ]  # type: ignore[assignment]
+
+    @model_validator(mode="after")
+    def validate_has_one_upper_one_lower_limit_range(self) -> Self:
+
+        commodity_type_ranges: Dict[CommodityQuantity, Tuple[bool, bool]] = {}
+
+        for limit_range in self.allowed_limit_ranges:
+            current: Tuple[bool, bool] = commodity_type_ranges.get(
+                limit_range.commodity_quantity, (False, False)
+            )
+
+            if limit_range.limit_type == PEBCPowerEnvelopeLimitType.UPPER_LIMIT:
+                current = (
+                    True,
+                    current[1],
+                )
+
+            if limit_range.limit_type == PEBCPowerEnvelopeLimitType.LOWER_LIMIT:
+                current = (
+                    current[0],
+                    True,
+                )
+
+            commodity_type_ranges[limit_range.commodity_quantity] = current
+
+        valid = True
+
+        for upper, lower in commodity_type_ranges.values():
+            valid = valid and upper and lower
+
+        if not valid:
+            raise ValueError(
+                self,
+                "There shall be at least one PEBC.AllowedLimitRange for the UPPER_LIMIT and at least one AllowedLimitRange for the LOWER_LIMIT.",
+            )
+
+        return self
+
+    @model_validator(mode="after")
+    def validate_valid_until_after_valid_from(self) -> Self:
+        if self.valid_until is not None and self.valid_until < self.valid_from:
+            raise ValueError(
+                self, "valid_until cannot be set to a value that is before valid_from."
+            )
+        return self

s2python/s2_connection.py

@@ -1,3 +1,10 @@
+try:
+    import websockets
+except ImportError as exc:
+    raise ImportError(
+        "The 'websockets' package is required. Run 'pip install s2-python[ws]' to use this feature."
+    ) from exc
+
 import asyncio
 import json
 import logging
@@ -8,8 +15,10 @@ import ssl
 from dataclasses import dataclass
 from typing import Any, Optional, List, Type, Dict, Callable, Awaitable, Union
 
-import websockets
-from websockets.asyncio.client import ClientConnection as WSConnection, connect as ws_connect
+from websockets.asyncio.client import (
+    ClientConnection as WSConnection,
+    connect as ws_connect,
+)
 
 from s2python.common import (
     ReceptionStatusValues,
@@ -56,7 +65,8 @@ class AssetDetails:  # pylint: disable=too-many-instance-attributes
     ) -> ResourceManagerDetails:
         return ResourceManagerDetails(
             available_control_types=[
-                control_type.get_protocol_control_type() for control_type in control_types
+                control_type.get_protocol_control_type()
+                for control_type in control_types
             ],
             currency=self.currency,
             firmware_version=self.firmware_version,
@@ -171,7 +181,9 @@ class MessageHandlers:
                 type(msg),
             )
 
-    def register_handler(self, msg_type: Type[S2Message], handler: S2MessageHandler) -> None:
+    def register_handler(
+        self, msg_type: Type[S2Message], handler: S2MessageHandler
+    ) -> None:
         """Register a coroutine function or a normal function as the handler for a specific S2 message type.
 
         :param msg_type: The S2 message type to attach the handler to.
@@ -228,7 +240,9 @@ class S2Connection:  # pylint: disable=too-many-instance-attributes
         self.asset_details = asset_details
         self._verify_certificate = verify_certificate
 
-        self._handlers.register_handler(SelectControlType, self.handle_select_control_type_as_rm)
+        self._handlers.register_handler(
+            SelectControlType, self.handle_select_control_type_as_rm
+        )
         self._handlers.register_handler(Handshake, self.handle_handshake)
         self._handlers.register_handler(HandshakeResponse, self.handle_handshake_response_as_rm)
         self._bearer_token = bearer_token
@@ -310,7 +324,10 @@ class S2Connection:  # pylint: disable=too-many-instance-attributes
                     await task
                 except asyncio.CancelledError:
                     pass
-                except (websockets.ConnectionClosedError, websockets.ConnectionClosedOK):
+                except (
+                    websockets.ConnectionClosedError,
+                    websockets.ConnectionClosedOK,
+                ):
                     logger.info("The other party closed the websocket connection.")
 
             for task in pending:
@@ -344,10 +361,14 @@ class S2Connection:  # pylint: disable=too-many-instance-attributes
     async def _connect_as_rm(self) -> None:
         await self.send_msg_and_await_reception_status_async(
             Handshake(
-                message_id=uuid.uuid4(), role=self.role, supported_protocol_versions=[S2_VERSION]
+                message_id=uuid.uuid4(),
+                role=self.role,
+                supported_protocol_versions=[S2_VERSION],
             )
         )
-        logger.debug("Send handshake to CEM. Expecting Handshake and HandshakeResponse from CEM.")
+        logger.debug(
+            "Send handshake to CEM. Expecting Handshake and HandshakeResponse from CEM."
+        )
 
         await self._handle_received_messages()
 
@@ -356,7 +377,8 @@ class S2Connection:  # pylint: disable=too-many-instance-attributes
     ) -> None:
         if not isinstance(message, Handshake):
             logger.error(
-                "Handler for Handshake received a message of the wrong type: %s", type(message)
+                "Handler for Handshake received a message of the wrong type: %s",
+                type(message),
             )
             return
 
@@ -379,7 +401,9 @@ class S2Connection:  # pylint: disable=too-many-instance-attributes
 
         logger.debug("Received HandshakeResponse %s", message.to_json())
 
-        logger.debug("CEM selected to use version %s", message.selected_protocol_version)
+        logger.debug(
+            "CEM selected to use version %s", message.selected_protocol_version
+        )
         await send_okay
         logger.debug("Handshake complete. Sending first ResourceManagerDetails.")
 
@@ -399,22 +423,29 @@ class S2Connection:  # pylint: disable=too-many-instance-attributes
 
         await send_okay
 
-        logger.debug("CEM selected control type %s. Activating control type.", message.control_type)
+        logger.debug(
+            "CEM selected control type %s. Activating control type.",
+            message.control_type,
+        )
 
         control_types_by_protocol_name = {
             c.get_protocol_control_type(): c for c in self.control_types
         }
-        selected_control_type: Optional[S2ControlType] = control_types_by_protocol_name.get(
-            message.control_type
+        selected_control_type: Optional[S2ControlType] = (
+            control_types_by_protocol_name.get(message.control_type)
         )
 
         if self._current_control_type is not None:
-            await self._eventloop.run_in_executor(None, self._current_control_type.deactivate, self)
+            await self._eventloop.run_in_executor(
+                None, self._current_control_type.deactivate, self
+            )
 
         self._current_control_type = selected_control_type
 
         if self._current_control_type is not None:
-            await self._eventloop.run_in_executor(None, self._current_control_type.activate, self)
+            await self._eventloop.run_in_executor(
+                None, self._current_control_type.activate, self
+            )
             self._current_control_type.register_handlers(self._handlers)
 
     async def _receive_messages(self) -> None:
@@ -485,7 +516,9 @@ class S2Connection:  # pylint: disable=too-many-instance-attributes
     async def respond_with_reception_status(
         self, subject_message_id: uuid.UUID, status: ReceptionStatusValues, diagnostic_label: str
     ) -> None:
-        logger.debug("Responding to message %s with status %s", subject_message_id, status)
+        logger.debug(
+            "Responding to message %s with status %s", subject_message_id, status
+        )
         await self._send_and_forget(
             ReceptionStatus(
                 subject_message_id=subject_message_id,
@@ -498,12 +531,17 @@ class S2Connection:  # pylint: disable=too-many-instance-attributes
         self, subject_message_id: uuid.UUID, status: ReceptionStatusValues, diagnostic_label: str
     ) -> None:
         asyncio.run_coroutine_threadsafe(
-            self.respond_with_reception_status(subject_message_id, status, diagnostic_label),
+            self.respond_with_reception_status(
+                subject_message_id, status, diagnostic_label
+            ),
             self._eventloop,
         ).result()
 
     async def send_msg_and_await_reception_status_async(
-        self, s2_msg: S2Message, timeout_reception_status: float = 5.0, raise_on_error: bool = True
+        self,
+        s2_msg: S2Message,
+        timeout_reception_status: float = 5.0,
+        raise_on_error: bool = True,
     ) -> ReceptionStatus:
         await self._send_and_forget(s2_msg)
         logger.debug(
@@ -524,12 +562,17 @@ class S2Connection:  # pylint: disable=too-many-instance-attributes
             raise
 
         if reception_status.status != ReceptionStatusValues.OK and raise_on_error:
-            raise RuntimeError(f"ReceptionStatus was not OK but rather {reception_status.status}")
+            raise RuntimeError(
+                f"ReceptionStatus was not OK but rather {reception_status.status}"
+            )
 
         return reception_status
 
     def send_msg_and_await_reception_status_sync(
-        self, s2_msg: S2Message, timeout_reception_status: float = 5.0, raise_on_error: bool = True
+        self,
+        s2_msg: S2Message,
+        timeout_reception_status: float = 5.0,
+        raise_on_error: bool = True,
     ) -> ReceptionStatus:
         return asyncio.run_coroutine_threadsafe(
             self.send_msg_and_await_reception_status_async(

s2python/s2_control_type.py

@@ -4,6 +4,7 @@ import typing
 from s2python.common import ControlType as ProtocolControlType
 from s2python.frbc import FRBCInstruction
 from s2python.ppbc import PPBCScheduleInstruction
+from s2python.ombc import OMBCInstruction
 from s2python.message import S2Message
 
 if typing.TYPE_CHECKING:
@@ -66,6 +67,26 @@ class PPBCControlType(S2ControlType):
         """Overwrite with the actual deactivation logic of your Resource Manager for this particular control type."""
 
 
+class OMBCControlType(S2ControlType):
+    def get_protocol_control_type(self) -> ProtocolControlType:
+        return ProtocolControlType.OPERATION_MODE_BASED_CONTROL
+
+    def register_handlers(self, handlers: "MessageHandlers") -> None:
+        handlers.register_handler(OMBCInstruction, self.handle_instruction)
+
+    @abc.abstractmethod
+    def handle_instruction(
+        self, conn: "S2Connection", msg: S2Message, send_okay: typing.Callable[[], None]
+    ) -> None: ...
+
+    @abc.abstractmethod
+    def activate(self, conn: "S2Connection") -> None:
+        """Overwrite with the actual dctivation logic of your Resource Manager for this particular control type."""
+
+    @abc.abstractmethod
+    def deactivate(self, conn: "S2Connection") -> None:
+        """Overwrite with the actual deactivation logic of your Resource Manager for this particular control type."""
+
 
 class PEBCControlType(S2ControlType):
     def get_protocol_control_type(self) -> ProtocolControlType:

s2python/s2_parser.py

@@ -24,6 +24,7 @@ from s2python.frbc import (
     FRBCTimerStatus,
     FRBCUsageForecast,
 )
+from s2python.pebc import PEBCPowerConstraints, PEBCEnergyConstraint, PEBCInstruction
 from s2python.ppbc import PPBCScheduleInstruction
 
 from s2python.message import S2Message
@@ -48,6 +49,9 @@ TYPE_TO_MESSAGE_CLASS: Dict[str, Type[S2Message]] = {
     "FRBC.TimerStatus": FRBCTimerStatus,
     "FRBC.UsageForecast": FRBCUsageForecast,
     "PPBC.ScheduleInstruction": PPBCScheduleInstruction,
+    "PEBC.PowerConstraints": PEBCPowerConstraints,
+    "PEBC.Instruction": PEBCInstruction,
+    "PEBC.EnergyConstraint": PEBCEnergyConstraint,
     "Handshake": Handshake,
     "HandshakeResponse": HandshakeResponse,
     "InstructionStatusUpdate": InstructionStatusUpdate,
@@ -90,7 +94,9 @@ class S2Parser:
         return TYPE_TO_MESSAGE_CLASS[message_type].model_validate(message_json)
 
     @staticmethod
-    def parse_as_message(unparsed_message: Union[dict, str, bytes], as_message: Type[M]) -> M:
+    def parse_as_message(
+        unparsed_message: Union[dict, str, bytes], as_message: Type[M]
+    ) -> M:
         """Parse the message to a specific S2 python message.
 
         :param unparsed_message: The message as a JSON-formatted string or as a JSON-parsed dictionary.

s2python/s2_validation_error.py

@@ -10,4 +10,6 @@ class S2ValidationError(Exception):
     class_: Optional[Type]
     obj: object
     msg: str
-    pydantic_validation_error: Union[ValidationErrorV1, ValidationError, TypeError, None]
+    pydantic_validation_error: Union[
+        ValidationErrorV1, ValidationError, TypeError, None
+    ]