ltbams 1.0.2a1__py3-none-any.whl → 1.0.3__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
ams/_version.py CHANGED
@@ -8,11 +8,11 @@ import json
8
8
 
9
9
  version_json = '''
10
10
  {
11
- "date": "2025-02-01T20:53:27-0500",
11
+ "date": "2025-03-17T16:36:49-0400",
12
12
  "dirty": false,
13
13
  "error": null,
14
- "full-revisionid": "b8525bc311f8262880316ee9cf5e697ad7ed80fc",
15
- "version": "1.0.2a1"
14
+ "full-revisionid": "d97c7b0b052ca9a5dd266cedb75054b5b0720010",
15
+ "version": "1.0.3"
16
16
  }
17
17
  ''' # END VERSION_JSON
18
18
 
ams/interface.py CHANGED
@@ -336,7 +336,12 @@ def parse_addfile(adsys, amsys, addfile):
336
336
 
337
337
  # NOTE: Group TimedEvent needs special treatment
338
338
  # adjust Toggle and Fault models
339
- toggle_df = df_models.get('Toggle') or df_models.get('Toggler')
339
+ keys_toggle = ['Toggle', 'Toggler']
340
+ toggle_df = None
341
+ for key in keys_toggle:
342
+ if key in df_models:
343
+ toggle_df = df_models[key]
344
+ break
340
345
  if toggle_df is not None:
341
346
  toggle_df['dev'] = toggle_df.apply(replace_dev, axis=1,
342
347
  mdl='model', dev='dev',
docs/source/conf.py CHANGED
@@ -201,3 +201,6 @@ shutil.copytree("../../examples/demonstration", "_examples/demo", )
201
201
  # sphinx-panels shouldn't add bootstrap css since the pydata-sphinx-theme
202
202
  # already loads it
203
203
  panels_add_bootstrap_css = False
204
+
205
+ # specify image loading behavior
206
+ image_loading = 'link'
@@ -71,7 +71,8 @@ development packages. Other packages will be required for interoperability.
71
71
  The extra support packages are specified in groups. The following group names
72
72
  are supported, with descriptions given below:
73
73
 
74
- - ``dev``: packages to support development such as testing and documentation
74
+ - ``dev``: packages to support development such as testing
75
+ - ``doc``: packages to support documentation building
75
76
 
76
77
  .. note::
77
78
 
@@ -82,15 +83,9 @@ To install packages in the ``dev`` when installing AMS, do:
82
83
 
83
84
  .. code:: bash
84
85
 
85
- pip install ltbams[dev]
86
+ pip install -r requirements-dev.txt
86
87
 
87
- To install all extra packages, do:
88
-
89
- .. code:: bash
90
-
91
- pip install ltbams[all]
92
-
93
- One can also inspect the ``requirements-extra.txt`` to identify the packages
88
+ One can also inspect the ``requirements-dev.txt`` to identify the packages
94
89
  for manual installation.
95
90
 
96
91
  .. _Develop Install:
@@ -134,14 +129,16 @@ Install dependencies with
134
129
  .. code:: bash
135
130
 
136
131
  mamba install --file requirements.txt
137
- mamba install --file requirements-extra.txt
132
+ mamba install --file requirements-dev.txt
133
+ mamba install --file requirements-doc.txt
138
134
 
139
135
  Alternatively, you can install them with ``pip``:
140
136
 
141
137
  .. code:: bash
142
138
 
143
139
  pip install -r requirements.txt
144
- pip install -r requirements-extra.txt
140
+ pip install -r requirements-dev.txt
141
+ pip install -r requirements-doc.txt
145
142
 
146
143
  Step 3: Install AMS in the development mode using
147
144
 
@@ -6,9 +6,15 @@ Release notes
6
6
 
7
7
  The APIs before v3.0.0 are in beta and may change without prior notice.
8
8
 
9
- Pre-v1.0.0
9
+ v1.0
10
10
  ==========
11
11
 
12
+ v1.0.3 (2024-03-17)
13
+
14
+ --------------------
15
+
16
+ - Bug fix in function ``ams.interface.parse_addfile``, released in v1.0.3a1
17
+
12
18
  v1.0.2 (2024-02-01)
13
19
 
14
20
  --------------------
@@ -35,6 +41,9 @@ v1.0.0 (2024-01-24)
35
41
  - Deprecate method ``get_idx`` and suggest using ``get_all_idxes`` instead
36
42
  - Remove module ``benchmarks.py`` and its tests for simplicity
37
43
 
44
+ Pre-v1.0
45
+ ==========
46
+
38
47
  v0.9.13 (2024-12-05)
39
48
  --------------------
40
49
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: ltbams
3
- Version: 1.0.2a1
3
+ Version: 1.0.3
4
4
  Summary: Python software for scheduling modeling and co-simulation with dynamics.
5
5
  Home-page: https://github.com/CURENT/ams
6
6
  Author: Jinning Wang
@@ -33,18 +33,24 @@ Python Software for Power System Scheduling Modeling and Co-Simulation with Dyna
33
33
  [![License: GPL-3.0](https://img.shields.io/badge/License-GPL--3.0-blue.svg)](https://github.com/CURENT/ams/blob/master/LICENSE)
34
34
  ![platforms](https://anaconda.org/conda-forge/ltbams/badges/platforms.svg)
35
35
  [![Python Versions](https://img.shields.io/badge/Python-3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12-blue)](https://www.python.org/)
36
+ [![DOI:10.1109/TSTE.2025.3528027](https://zenodo.org/badge/DOI/10.1109/TSTE.2025.3528027.svg)](https://ieeexplore.ieee.org/document/10836855)
36
37
  [![Project Status: Active – The project has reached a stable, usable state and is being actively developed.](https://www.repostatus.org/badges/latest/active.svg)](https://www.repostatus.org/#active)
38
+ [![codecov](https://codecov.io/gh/CURENT/ams/graph/badge.svg?token=RZI5GLLBQH)](https://codecov.io/gh/CURENT/ams)
37
39
  ![Repo Size](https://img.shields.io/github/repo-size/CURENT/ams)
38
40
  [![GitHub last commit (master)](https://img.shields.io/github/last-commit/CURENT/ams/master?label=last%20commit%20to%20master)](https://github.com/CURENT/ams/commits/master/)
39
41
  [![GitHub last commit (develop)](https://img.shields.io/github/last-commit/CURENT/ams/develop?label=last%20commit%20to%20develop)](https://github.com/CURENT/ams/commits/develop/)
40
42
  [![libraries](https://img.shields.io/librariesio/release/pypi/ltbams)](https://libraries.io/pypi/ltbams)
41
43
  [![Structure](https://img.shields.io/badge/code_base-visualize-blue)](https://mango-dune-07a8b7110.1.azurestaticapps.net/?repo=CURENT%2Fams)
42
44
 
45
+ [![Compatibility Tests](https://github.com/CURENT/ams/actions/workflows/compatibility.yml/badge.svg)](https://github.com/CURENT/ams/actions/workflows/compatibility.yml)
46
+ [![Publish to TestPyPI and PyPI](https://github.com/CURENT/ams/actions/workflows/publish-pypi.yml/badge.svg?branch=master)](https://github.com/CURENT/ams/actions/workflows/publish-pypi.yml)
47
+ [![Azure Pipline](https://dev.azure.com/curentltb/ams/_apis/build/status%2FCURENT.ams?branchName=master)](https://dev.azure.com/curentltb/ams/_build/latest?definitionId=2&branchName=master)
48
+
43
49
  <img src="docs/source/images/sponsors/CURENT_Logo_NameOnTrans.png" alt="CURENT ERC Logo" width="300" height="auto">
44
50
 
45
- | | Latest | Stable |
51
+ | | Stable | Latest |
46
52
  |---------------|-----------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------|
47
- | Documentation | [![Latest Documentation](https://readthedocs.org/projects/ams/badge/?version=latest)](https://ams.readthedocs.io/en/latest/?badge=latest) | [![Documentation Status](https://readthedocs.org/projects/ams/badge/?version=stable)](https://ams.readthedocs.io/en/stable/?badge=stable) |
53
+ | Documentation | [![Documentation Status](https://readthedocs.org/projects/ams/badge/?version=stable)](https://ams.readthedocs.io/en/stable/?badge=stable) | [![Latest Documentation](https://readthedocs.org/projects/ams/badge/?version=latest)](https://ams.readthedocs.io/en/latest/?badge=latest) |
48
54
 
49
55
 
50
56
  | Badges | | |
@@ -52,7 +58,7 @@ Python Software for Power System Scheduling Modeling and Co-Simulation with Dyna
52
58
  | Downloads | [![PyPI Version](https://img.shields.io/pypi/v/ltbams.svg)](https://pypi.python.org/pypi/ltbams) | [![Conda Version](https://anaconda.org/conda-forge/ltbams/badges/version.svg)](https://anaconda.org/conda-forge/ltbams) |
53
59
  | Try on Binder | [![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/curent/ams/master) | |
54
60
  | Code Quality |[![Codacy Badge](https://app.codacy.com/project/badge/Grade/69456da1b8634f2f984bd769e35f0050)](https://app.codacy.com/gh/CURENT/ams/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade)| [![Codacy Badge](https://app.codacy.com/project/badge/Coverage/69456da1b8634f2f984bd769e35f0050)](https://app.codacy.com/gh/CURENT/ams/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_coverage) |
55
- | Build Status | [![GitHub Action Status](https://github.com/CURENT/ams/workflows/Python%20application/badge.svg)](https://github.com/curent/ams/actions) | [![Build Status](https://dev.azure.com/curentltb/ams/_apis/build/status%2FCURENT.ams?branchName=master)](https://dev.azure.com/curentltb/ams/_build/latest?definitionId=2&branchName=master) |
61
+
56
62
 
57
63
 
58
64
  # Why AMS
@@ -139,11 +145,12 @@ pip install git+https://github.com/CURENT/ams.git
139
145
  ```
140
146
 
141
147
  ***NOTE:***
142
- - Version **0.9.9** has known issues and has been yanked from PyPI
143
- - `kvxopt` is recommended to install via `conda` as sometimes ``pip`` struggles to set the correct path for compiled libraries
148
+ - `cvxpy` is distributed with the open source solvers CLARABEL, OSQP, and SCS, but MIP-capable solvers need separate installation
144
149
  - `cvxpy` versions **below 1.5** are incompatible with `numpy` versions **2.0 and above**
145
150
  - If the solver `SCIP` encounters an import error caused by a missing `libscip.9.1.dylib`, try reinstalling its Python interface by running `pip install pyscipopt --no-binary scip --force`
146
- - Version **1.0.0** is only available on PyPI
151
+ - `kvxopt` is recommended to install via `conda` as sometimes ``pip`` struggles to set the correct path for compiled libraries
152
+ - Versions **1.0.0** and **1.0.1** are only available on PyPI
153
+ - Version **0.9.9** has known issues and has been yanked from PyPI
147
154
 
148
155
  # Example Usage
149
156
 
@@ -1,8 +1,8 @@
1
1
  ams/__init__.py,sha256=dKIwng8xES4NQHn6ZHy8RCKeXphN9z2wyfmbvniIEg0,351
2
2
  ams/__main__.py,sha256=EB4GfGiKgvnQ_psNr0QwPoziYvjmGvQ2yVsBwQtfrLw,170
3
- ams/_version.py,sha256=KYWVlZmuR5_LFiUY5ldCbtYy6hyWmWkIpRYe4Lpa96c,499
3
+ ams/_version.py,sha256=a5XiEr8S4lQq3V5nWEb7oncht4lDy293lJyJBtcFiU8,497
4
4
  ams/cli.py,sha256=EyNFXn565gFCppTxpyTZviBdPgUuKtgAPZ4WE6xewRk,6164
5
- ams/interface.py,sha256=PA_F5KEK7BrSvHjgz3v7vPXH2KEhOerZ7sNLrgT0IcU,44380
5
+ ams/interface.py,sha256=PCR9geO-pvCxXxljWP4u3M-BAdVD5DjA3xvf338g9x8,44487
6
6
  ams/main.py,sha256=wzKLe_BeQAUyFh-U1cxQIOwr-rAJM8ppB3EEi6_v2tw,23607
7
7
  ams/report.py,sha256=gUscOYpPjuPuruzIXAADaifIZv2BSjmP1oKCuHdD3Vw,11004
8
8
  ams/shared.py,sha256=Zdy4-kHKc0_3CzyZKmGyCvpmrJz4Wzs9qnFlk8eyzq0,4159
@@ -122,11 +122,11 @@ ams/utils/paths.py,sha256=D9VNUwtJtHy-8PFzMnxtQ9HpkOXT6vdVOjfOTuoKGKw,6699
122
122
  docs/Makefile,sha256=UKXBFAbKGPt1Xw9J84343v0Mh8ylAZ-tE0uCd74DrQU,725
123
123
  docs/make.bat,sha256=9UgKGb4SdP006622fJiFxeFT1BeycYAs6hDbV1xwPy8,804
124
124
  docs/source/api.rst,sha256=gDix4Vg_SNUqtijlSmfBktpOrWQMdaj4xsBKrO22dfw,1402
125
- docs/source/conf.py,sha256=Mh6DMonUOvfw2YyQuhbFz5S-TxQbAgQXa2cQXhZlJBQ,6631
125
+ docs/source/conf.py,sha256=ozLsGWVbFOZZfruXlvL6ou8i-R8kyCYZedtDzSQVRoU,6688
126
126
  docs/source/genmodelref.py,sha256=IhmF7bDw8BXPvLD8V3WjQNrfc-H07r5iS-_4DHbbp-8,1420
127
127
  docs/source/genroutineref.py,sha256=0JyMc2kV5bWrWbSoO6d7o4QgDgG8mVy3JGGQWacJypw,1064
128
128
  docs/source/index.rst,sha256=N5phQS5RIyYs-NZo_5yYB8LjvHzOKLeXzRA-M8i-g3Q,2688
129
- docs/source/release-notes.rst,sha256=0U7P6i5rAdL3aevH9A9mQXL0Nqn9C_zrs98ca0L-vu8,12592
129
+ docs/source/release-notes.rst,sha256=pLfgJ-27rcFSy76xWZ3ZPjbSFrL1R0n0BPz-UKtBFi4,12727
130
130
  docs/source/_templates/autosummary/base.rst,sha256=zl3U4baR4a6YjsHyT-x9zCOrHwKZOVUdWn1NPX2u3bc,106
131
131
  docs/source/_templates/autosummary/class.rst,sha256=Hv_igCsLsUpM62_zN0nqj6FSfKnS5xLyu8ZldMbfOAk,668
132
132
  docs/source/_templates/autosummary/module.rst,sha256=YdbpCudOrEU-JbuSlzGvcOI2hn_KrCM6FW5HcGqkaEE,1113
@@ -134,7 +134,7 @@ docs/source/_templates/autosummary/module_toctree.rst,sha256=sg30OdqFDLyo8Y3hl9V
134
134
  docs/source/examples/index.rst,sha256=u6-pMB5ecSpNb3x1QWC6tJ8ACh3M6MjLBc4CVFf2z_0,876
135
135
  docs/source/getting_started/copyright.rst,sha256=XBfWvLm7T8p-zh1jkDy1kODvTDcH73AEV_vkiN32A2o,715
136
136
  docs/source/getting_started/index.rst,sha256=mcp1NdUwbPoNzpn7Owf5Qzfd6J_--ToU52PjmrbwjBY,1512
137
- docs/source/getting_started/install.rst,sha256=YVlKyz1H_TZHWQP1GM0L2gOMg4gj3hwyviYRpVOnxQo,7221
137
+ docs/source/getting_started/install.rst,sha256=gE4L0ApiC_mwbjbYtkGW4ilyIAu_Jn-VIeoYlgRiOIw,7268
138
138
  docs/source/getting_started/overview.rst,sha256=Zy890bDCUVW37NvjhQFUJUae1Zkghr72Az4Qd0PhP_I,1068
139
139
  docs/source/getting_started/testcase.rst,sha256=L3fGjfm7mGj7ChRovYw5Jx6OP8PU5pTerid0_Y4iKVM,2016
140
140
  docs/source/getting_started/verification.rst,sha256=Jxbgf-SmXYLSokylr1LKtGOjAWUc7a5D-uT_mQZ7i7c,243
@@ -181,8 +181,8 @@ tests/test_rtn_pflow.py,sha256=aDL5Ewm6lWqpdHqIIu-DTllhXzt4bMjsLJaKbJa8sXQ,6990
181
181
  tests/test_rtn_rted.py,sha256=AyW5B4A51L_nIVLX1eYeu9ZUboOh1CH2FVj2C1XJjSc,9769
182
182
  tests/test_rtn_uc.py,sha256=vdG2ss3q91CXLZ2sUgzoUr1NU-63ue7nOxAYywMordE,8286
183
183
  tests/test_service.py,sha256=8YIa_PXurwgOzsWvUqoyqS_AzlpdrKHIMxAln5fIqCU,2438
184
- ltbams-1.0.2a1.dist-info/METADATA,sha256=j57ek2A5JN4QJHjNiJ4osX_4DOboD2QHi2d4iwnIeKE,13068
185
- ltbams-1.0.2a1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
186
- ltbams-1.0.2a1.dist-info/entry_points.txt,sha256=FA56FlhO_yVNeEf810SrorVQb7_Xsmo3_EW-W-ijUfA,37
187
- ltbams-1.0.2a1.dist-info/top_level.txt,sha256=pyKDqG2kj13F9-BYd_wkruRdBSqLXw8Nwc-cmljqrxg,15
188
- ltbams-1.0.2a1.dist-info/RECORD,,
184
+ ltbams-1.0.3.dist-info/METADATA,sha256=yQySznuveQ71GANYStyeUgEYfZDQ_K56NZUZ7nZD3Ss,13671
185
+ ltbams-1.0.3.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
186
+ ltbams-1.0.3.dist-info/entry_points.txt,sha256=FA56FlhO_yVNeEf810SrorVQb7_Xsmo3_EW-W-ijUfA,37
187
+ ltbams-1.0.3.dist-info/top_level.txt,sha256=pyKDqG2kj13F9-BYd_wkruRdBSqLXw8Nwc-cmljqrxg,15
188
+ ltbams-1.0.3.dist-info/RECORD,,
@@ -1,5 +1,5 @@
1
1
  Wheel-Version: 1.0
2
- Generator: setuptools (75.8.0)
2
+ Generator: setuptools (76.0.0)
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
5
5