Feature: run prototype with command line tool by ChouaneLouis · Pull Request #36 · AntaresSimulatorTeam/GemsPy

ChouaneLouis · 2024-05-07T08:08:24Z

No description provided.

Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>

… timeseries

to test see tests/unittests/data/components_for_thermal_cluster.yml

allows to take data with several scenarios

ianmnz · 2024-05-17T08:35:06Z

src/andromede/main/main.py

+        return resolve_components_and_cnx(parse_yaml_components(comp), model)
+
+
+if __name__ == "__main__":


For clarity, I suggest to put all that is bellow here in a "main" function:

Suggested change

if __name__ == "__main__":

if __name__ == "__main__":

main()

enable the possibility to use the command with only the parameter --study fix the fact that the preloaded_libraries parameter in the resolve_library method didn't keep the preloaded models in the returned library

ianmnz · 2024-05-22T07:50:36Z

src/andromede/main/main.py

+    database = None
+
+    if args.study:
+        if args.models or args.component or args.timeseries:


I think there's a way in ParseArgs to create exclusive groups, i.e., sets of arguments that can't be passed together so you would automatically check for this, but maybe it won't be enough for your needs here :)

there is but you can't make an argument excludes with other arguments which are not mutually exclusive

the importing order is an depth-first travelsal of the tree going from every library to the root or an already imported library the algo : - checks if there is cycles and raise error if so - can import models form 2 separated tree - doesnt check if ports are defined twice no test available the code isnt commented

sylvlecl

A few suggestions:

adding a "console script" entry point
moving some new methods to more appropriate places in inner modules

sylvlecl · 2024-06-03T08:59:10Z

src/andromede/model/parsing.py


 class InputLibrary(BaseModel):
    id: str
+    dependence: Optional[str] = None


We should allow a list here to import multiple libraries --> "dependencies"

tests/functional/input/components/components.yml

src/andromede/main/main.py

sylvlecl · 2024-06-03T09:47:54Z

src/andromede/main/main.py

+                if import_stack[-1].dependence in did:
+                    lib = resolve_library(import_stack[-1], [output_lib])
+
+                    output_lib.models.update(lib.models)


we can add a check here that there is no name conflict between models

sylvlecl · 2024-06-03T09:48:03Z

src/andromede/main/main.py

+                    lib = resolve_library(import_stack[-1], [output_lib])
+
+                    output_lib.models.update(lib.models)
+                    output_lib.port_types.update(lib.port_types)


we can add a check here that there is no name conflict between port types

sylvlecl · 2024-06-03T09:49:37Z

src/andromede/main/main.py

+            yaml_libraries[yaml_lib.id] = yaml_lib
+
+    todo = list(yaml_libraries.values())
+    did = list()


Note that it's better to use a set for this kind of use: a search in a set is more efficient than in a list (to be honest here it does not really matter in practice because it will always be small).

sylvlecl · 2024-06-03T11:09:22Z

src/andromede/main/main.py

+            parser.error(
+                "--study flag can't be use with --models, --component and --timeseries"
+            )
+        components_path = args.study / "input" / "components" / "components.yml"


Let's move this logic (of parsing all data from one directory) to andromede.study.parsing

sylvlecl · 2024-06-03T11:11:16Z

src/andromede/main/main.py

+        print("scenario ", scenario)
+        print("status : ", status)
+
+    print("avarage final cost : ", problem.solver.Objective().Value())


typo "average"

sylvlecl · 2024-06-03T11:12:01Z

src/andromede/main/main.py

+def main() -> None:
+    parser = argparse.ArgumentParser()
+    parser.add_argument(
+        "--study", type=Path, help="path to the root dirertory of the study"


typo directory

sylvlecl · 2024-06-03T11:12:37Z

src/andromede/main/main.py

+        "--component", type=Path, help="path to the component file, *.yml"
+    )
+    parser.add_argument(
+        "--timeseries", type=Path, help="path to the timeseries dirertory"


typo directory

fix old test, changing input library to list of input libraries

vargastat and others added 25 commits April 23, 2024 18:26

InputComponent added work in progress

144616d

wip components parsing corrected

1a66ac9

port_connections to be defined

4e156f0

wip

27e8377

resolve_components.py completed

c7ccaa6

git commit -m 'connections from list to Dict'

0153969

consistency check between components and models added

c888296

wip

8b1872e

wip

23c31d8

build_network and build_database added

c778b1f

build network and read data from yaml

551d4e6

timeseries read with pandas

c25a2d0

timeseries read with pandas

c4579d0

test_evaluate_time_series corrected

22a62d2

rebase from main

2e77a30

mypy.ini modified to ignore missing imports pandas

c3413e8

Use pandas-stubs

f038183

Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>

TimeScenarioSeriesData refacto

f537fd1

test corrected to use dataframe for TimeScenarioSeriesData

1eb5c2e

TimeScenarioSeriesData modified for dataframe

b1c7a1e

pandas-stub <=2.0.3 for dependency issue

f0a9bcf

test test_short_term_storage_base_with_yaml added for components with…

aff0de8

… timeseries

timeseries provided as parameter without file extension

336336d

add executable main file

24c0bfc

to test see tests/unittests/data/components_for_thermal_cluster.yml

add the --scenario parameter

b78bfea

allows to take data with several scenarios

sylvlecl changed the title ~~Feature/executable~~ Feature: run prototype with command line tool May 13, 2024

sylvlecl changed the base branch from main to add-yaml-test May 13, 2024 12:40

sylvlecl changed the base branch from add-yaml-test to main May 13, 2024 12:41

Merge branch 'main' into feature/executable

29dd5e8

ianmnz reviewed May 17, 2024

View reviewed changes

ChouaneLouis added 2 commits May 17, 2024 16:03

moved main code into a main() function

941d5f5

project file structure implemented

f45d135

enable the possibility to use the command with only the parameter --study fix the fact that the preloaded_libraries parameter in the resolve_library method didn't keep the preloaded models in the returned library

ianmnz reviewed May 22, 2024

View reviewed changes

ChouaneLouis and others added 2 commits May 23, 2024 11:20

Merge remote-tracking branch 'origin/main' into feature/executable

8541707

sylvlecl requested changes Jun 3, 2024

View reviewed changes

ChouaneLouis and others added 6 commits June 5, 2024 11:07

moved library resolving in the resolve_library module

0e0b8bc

add tests for library resolving

4249f6b

fix old test, changing input library to list of input libraries

add yaml libraries used in tests

5a21ccd

Better organized command parsing

532f7a4

Merge branch 'main' into feature/executable

2a1d478

Added CLI

2d77cca

ianmnz requested a review from sylvlecl August 28, 2024 13:56

sylvlecl approved these changes Aug 28, 2024

View reviewed changes

ianmnz merged commit 52e01dd into main Aug 28, 2024

ianmnz deleted the feature/executable branch August 28, 2024 14:25

		return resolve_components_and_cnx(parse_yaml_components(comp), model)


		if __name__ == "__main__":

Conversation

ChouaneLouis commented May 7, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ianmnz May 22, 2024 • 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!

Choose a reason for hiding this comment

Uh oh!

sylvlecl left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ianmnz May 22, 2024 •

edited

Loading