PEBC skeleton class implementation by VladIftime · Pull Request #60 · flexiblepower/s2-python

VladIftime · 2024-12-26T08:25:33Z

This pull request introduces several new classes and updates existing ones in the src/s2python/pebc directory. These changes primarily involve importing necessary modules, defining new classes, and configuring model validation. The most important changes include the addition of new classes for handling PEBC constraints and envelopes, as well as updating model configurations to enable assignment validation.

…erEnvelope classes; remove obsolete PEBCPowerEnvelopeLimitType

…__init__.py file

…nergy constraint module

"error": { "message": "We could not parse the JSON body of your request. (HINT: This likely means you aren't using your HTTP library correctly. The OpenAI API expects a JSON payload, but what was sent was not valid JSON. If you have trouble figuring out how to fix this, please contact us through our help center at help.openai.com.)", "type": "invalid_request_error", "param": null, "code": null } } null

"model": "gpt-4", "messages": [ { "role": "system", "content": "You are a helpful assistant that creates concise, meaningful git commit messages based on code changes." }, { "role": "user", "content": "Generate a commit message for the following changes:\n src/s2python/pebc/pebc_instruction.py | 1 + src/s2python/pebc/pebc_power_constraints.py | 1 + 2 files changed, 2 insertions(+)\nFiles changed:\nsrc/s2python/pebc/pebc_instruction.py,src/s2python/pebc/pebc_power_constraints.py," } ] } OpenAI API Response: { "error": { "message": "We could not parse the JSON body of your request. (HINT: This likely means you aren't using your HTTP library correctly. The OpenAI API expects a JSON payload, but what was sent was not valid JSON. If you have trouble figuring out how to fix this, please contact us through our help center at help.openai.com.)", "type": "invalid_request_error", "param": null, "code": null } } null

"model": "gpt-4", "messages": [ { "role": "system", "content": "You are a helpful assistant that creates concise, meaningful git commit messages based on code changes." }, { "role": "user", "content": "Generate a commit message for the following changes:\n src/s2python/pebc/pebc_instruction.py | 1 - src/s2python/pebc/pebc_power_constraints.py | 1 - 2 files changed, 2 deletions(-)\nFiles changed:\nsrc/s2python/pebc/pebc_instruction.py,src/s2python/pebc/pebc_power_constraints.py" } ] } OpenAI API Response: { "error": { "message": "We could not parse the JSON body of your request. (HINT: This likely means you aren't using your HTTP library correctly. The OpenAI API expects a JSON payload, but what was sent was not valid JSON. If you have trouble figuring out how to fix this, please contact us through our help center at help.openai.com.)", "type": "invalid_request_error", "param": null, "code": null } } null

"model": "gpt-4", "messages": [ { "role": "system", "content": "You are a helpful assistant that creates concise, meaningful git commit messages based on code changes." }, { "role": "user", "content": "Generate a commit message for the following changes:\n src/s2python/pebc/pebc_instruction.py | 1 + src/s2python/pebc/pebc_power_constraints.py | 1 + 2 files changed, 2 insertions(+) \nFiles changed:\nsrc/s2python/pebc/pebc_instruction.py,src/s2python/pebc/pebc_power_constraints.py," } ] } OpenAI API Response: { "id": "chatcmpl-Al2WJ2cNcBy1e7SuAXcIMjLbcFdBs", "object": "chat.completion", "created": 1735774467, "model": "gpt-4-0613", "choices": [ { "index": 0, "message": { "role": "assistant", "content": "Added new code lines in pebc_instruction.py and pebc_power_constraints.py", "refusal": null }, "logprobs": null, "finish_reason": "stop" } ], "usage": { "prompt_tokens": 116, "completion_tokens": 16, "total_tokens": 132, "prompt_tokens_details": { "cached_tokens": 0, "audio_tokens": 0 }, "completion_tokens_details": { "reasoning_tokens": 0, "audio_tokens": 0, "accepted_prediction_tokens": 0, "rejected_prediction_tokens": 0 } }, "system_fingerprint": null } Added new code lines in pebc_instruction.py and pebc_power_constraints.py

"model": "gpt-4", "messages": [ { "role": "system", "content": "You are a helpful assistant that creates concise, meaningful git commit messages based on code changes." }, { "role": "user", "content": "Generate a commit message for the following changes:\n src/s2python/pebc/pebc_instruction.py | 1 - src/s2python/pebc/pebc_power_constraints.py | 1 - 2 files changed, 2 deletions(-) \nFiles changed:\nsrc/s2python/pebc/pebc_instruction.py,src/s2python/pebc/pebc_power_constraints.py," } ] } Removed unnecessary lines from pebc_instruction.py and pebc_power_constraints.py

"model": "gpt-4", "messages": [ { "role": "system", "content": "You are a helpful assistant that creates concise, meaningful git commit messages based on code changes." }, { "role": "user", "content": "Generate a commit message for the following changes:\n src/s2python/pebc/pebc_instruction.py | 1 + src/s2python/pebc/pebc_power_constraints.py | 1 + 2 files changed, 2 insertions(+) \nFiles changed:\nsrc/s2python/pebc/pebc_instruction.py,src/s2python/pebc/pebc_power_constraints.py," } ] } OpenAI API Response: { "id": "chatcmpl-AlAbv6QhnCJYGj5n7bQAdF7PiD0iT", "object": "chat.completion", "created": 1735805567, "model": "gpt-4-0613", "choices": [ { "index": 0, "message": { "role": "assistant", "content": "Added new functionalities to pebc_instruction and pebc_power_constraints files", "refusal": null }, "logprobs": null, "finish_reason": "stop" } ], "usage": { "prompt_tokens": 116, "completion_tokens": 14, "total_tokens": 130, "prompt_tokens_details": { "cached_tokens": 0, "audio_tokens": 0 }, "completion_tokens_details": { "reasoning_tokens": 0, "audio_tokens": 0, "accepted_prediction_tokens": 0, "rejected_prediction_tokens": 0 } }, "system_fingerprint": null } Added new functionalities to pebc_instruction and pebc_power_constraints files

…raints.py"

…traints.py"

…traints.py

…raints.py files

…ules.

… modules in s2python.

…y files in s2python module

jorritn · 2025-01-07T16:31:12Z

This will resolve #64

wcoenraads

Thanks for implementing this! Your changes look good to me; however, the control type still needs to be added to s2python/s2_control_type.py. If you add that, I think we can merge this.

P.S. I sent you an email with an extra question I had regarding the generated code.

VladIftime · 2025-01-13T10:05:39Z

Thanks for implementing this! Your changes look good to me; however, the control type still needs to be added to s2python/s2_control_type.py. If you add that, I think we can merge this.

P.S. I sent you an email with an extra question I had regarding the generated code.

I did not receive any emails.

wcoenraads

Thanks for adding PEBC to s2_control_type.py! However, it seems this commit also includes a bunch of build files in build/. If you remove those, we're good to merge.

wcoenraads · 2025-01-14T15:21:45Z

Another minor issue I discovered while working on a PEBC example: PEBCInstruction is missing from pebc/__init__.py.

EDIT: PEBCPowerEnvelopeConsequenceType also appears to be missing.

Signed-off-by: Vlad Iftime <vladiftime60@gmail.com>

wcoenraads · 2025-01-22T10:49:20Z

Thanks for adding the missing classes! I think the only two things remaining are:

Adding PEBCInstruction to the exports in __init__.py
Removing the build files from the pull request

Once that's done, this is ready to merge.

Signed-off-by: Vlad Iftime <vladiftime60@gmail.com>

…/s2-python into Dev-VladIftime-Kiflin-PEBC

Signed-off-by: Vlad Iftime <vladiftime60@gmail.com>

wcoenraads

Looks good to me - thanks!

VladIftime added 4 commits December 26, 2024 00:12

Publish branch.

48b1155

PEBC power envelope limit type

dacd4f6

Implement PEBCAllowedLimitRange, PEBCPowerEnvelopeElement and PEBCPow…

efc364e

…erEnvelope classes; remove obsolete PEBCPowerEnvelopeLimitType

Implement PEBCEnergyConstraint and PEBCPowerConstraints classes; add …

bb3f15d

…__init__.py file

VladIftime self-assigned this Dec 26, 2024

VladIftime added 19 commits December 26, 2024 10:29

Add PEBCInstruction class and __init__.py file; refactor imports in e…

d733118

…nergy constraint module

Add PEBCInstruction class and __init__.py file; refactor imports in e…

8d63c42

…nergy constraint module

null

743bc49

"Updated pebc_instruction.py and removed a line from pebc_power_const…

b5ac5d6

…raints.py"

"Updated pebc_instruction.py and added new feature to pebc_power_cons…

992c44e

…traints.py"

Removed unnecessary code from pebc_instruction.py and pebc_power_cons…

69af086

…traints.py

"Added new lines in pebc_instruction and pebc_power_constraints modules"

9cd6efe

Removed unnecessary lines in pebc_instruction.py and pebc_power_const…

6e8e3c2

…raints.py files

Added new relevant instructions and power constraints in the PEBC mod…

097b382

…ules.

Added missing elements in pebc_instruction and pebc_power_constraints…

c8db0cf

… modules in s2python.

Added new methods to pebc_instruction.py and pebc_power_constraints.p…

76314a3

…y files in s2python module

Refactored class definitions in PEBC modules for improved readability

4f619a7

Refactored class definitions in PEBC modules for improved readability

1e64126

jorritn mentioned this pull request Jan 7, 2025

Create PEBC wrapper classes #64

Closed

VladIftime changed the title ~~PEBC implementation~~ PEBC skeleton class implementation Jan 8, 2025

wcoenraads requested changes Jan 9, 2025

View reviewed changes

Added the controll type to s2_control_type wrapper

bdf93eb

Added the controll type to s2_control_type wrapper

ba68d80

wcoenraads requested changes Jan 13, 2025

View reviewed changes

Added missing classes to init

9f4bdb0

Signed-off-by: Vlad Iftime <vladiftime60@gmail.com>

VladIftime added 5 commits January 24, 2025 11:30

Removed build files and added the PEBC_instruction in the submodule init

5322535

Signed-off-by: Vlad Iftime <vladiftime60@gmail.com>

Merge branch 'Dev-VladIftime-Kiflin-PEBC' of github.com:flexiblepower…

cd83b32

…/s2-python into Dev-VladIftime-Kiflin-PEBC

Removed build files and added the PEBC_instruction in the submodule init

7d7e637

Signed-off-by: Vlad Iftime <vladiftime60@gmail.com>

Merge branch 'main' into Dev-VladIftime-Kiflin-PEBC

6931510

Fixed the new type of S2Message as union

69ef8ba

Signed-off-by: Vlad Iftime <vladiftime60@gmail.com>

VladIftime requested a review from wcoenraads January 24, 2025 11:41

wcoenraads approved these changes Feb 10, 2025

View reviewed changes

Merge branch 'main' into Dev-VladIftime-Kiflin-PEBC

0fcadc5

VladIftime merged commit d4b6d74 into main Mar 3, 2025
1 check passed

VladIftime deleted the Dev-VladIftime-Kiflin-PEBC branch March 3, 2025 09:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

PEBC skeleton class implementation#60

PEBC skeleton class implementation#60
VladIftime merged 32 commits intomainfrom
Dev-VladIftime-Kiflin-PEBC

VladIftime commented Dec 26, 2024

Uh oh!

jorritn commented Jan 7, 2025

Uh oh!

wcoenraads left a comment •

edited

Loading

Uh oh!

VladIftime commented Jan 13, 2025

Uh oh!

wcoenraads left a comment

Uh oh!

wcoenraads commented Jan 14, 2025 •

edited

Loading

Uh oh!

wcoenraads commented Jan 22, 2025

Uh oh!

wcoenraads left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments

Conversation

VladIftime commented Dec 26, 2024

Uh oh!

jorritn commented Jan 7, 2025

Uh oh!

wcoenraads left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

VladIftime commented Jan 13, 2025

Uh oh!

wcoenraads left a comment

Choose a reason for hiding this comment

Uh oh!

wcoenraads commented Jan 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wcoenraads commented Jan 22, 2025

Uh oh!

wcoenraads left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

wcoenraads left a comment •

edited

Loading

wcoenraads commented Jan 14, 2025 •

edited

Loading