swmm-pandas 0.6.0__py3-none-any.whl → 0.7.2__py3-none-any.whl

swmm/pandas/__init__.py

@@ -1,6 +1,6 @@
 """Top-level package for swmm.pandas"""
 
-__version__ = "0.6.0"
+__version__ = "0.7.2"
 
 from swmm.pandas.output import Output
 from swmm.pandas.report import Report

swmm/pandas/input/_section_classes.py

@@ -1635,9 +1635,76 @@ class Losses(SectionDf):
         return super(Losses, df).to_swmm_string()
 
 
-class Controls(SectionText):
+class Controls(SectionBase):
     _section_name = "CONTROLS"
 
+    @dataclass
+    class Control:
+        name: str
+        control_text: str
+        desc: str
+
+    def __init__(self, controls: dict[str:Control]):
+        self.controls = controls
+
+    @classmethod
+    def from_section_text(cls, text: str, *args, **kwargs) -> Self:
+        # The regex pattern:
+        # (?m)      - Enable multiline mode to make ^ match start of each line
+        # ^         - Match start of line
+        # \s*       - Match any whitespace at start of line
+        # RULE\s+   - Match "RULE" followed by whitespace
+        # \S+       - Match the rule name (non-whitespace characters)
+        rule_line_pattern = R"(?m)^\s*RULE\s+\S+"
+        rules: dict[str : Controls.Control] = {}
+        rule_start_pattern = R"(?m)(?:^;+.*\n)*^RULE.*"
+        matches = list(re.finditer(rule_start_pattern, text))
+        start_char = 0
+        end_char = 0
+        for imatch in range(len(matches)):
+            if imatch == len(matches) - 1:
+                end_char = -1
+            else:
+                end_char = matches[imatch + 1].start()
+
+            rule_block = text[start_char:end_char]
+            mat = re.search(rule_line_pattern, rule_block)
+            if mat is None:
+                raise Exception(f"Error parsing rule\n{rule_block}")
+            else:
+                desc, rule = re.split(rule_line_pattern, rule_block)
+                rule = f"{mat.group()}{rule}"
+                rule_name = mat.group().split()[1]
+                rules[rule_name] = Controls.Control(
+                    name=rule_name, control_text=rule, desc=desc
+                )
+
+            start_char = end_char
+
+        return cls(rules)
+
+    @classmethod
+    def _from_section_text(cls, text: str, *args, **kwargs) -> Self: ...
+
+    @classmethod
+    def _new_empty(cls) -> Self:
+        return cls({})
+
+    @classmethod
+    def _newobj(cls, *args, **kwargs) -> Self:
+        return cls(*args, **kwargs)
+
+    def to_swmm_string(self) -> str:
+        out_text = ""
+        for control in self.controls.controls.values():
+            if len(control.desc) > 0:
+                out_text += f"{control.desc.strip('\n')}\n"
+            out_text += f"{control.control_text.strip('\n')}\n\n"
+        return out_text
+
+    def add_control(self, name: str, control_text: str, desc: str):
+        self.controls[name] = Controls.Control(name, control_text, desc)
+
 
 class Pollutants(SectionDf):
     _section_name = "POLLUTANTS"

{swmm_pandas-0.6.0.dist-info → swmm_pandas-0.7.2.dist-info}/METADATA

@@ -1,12 +1,14 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: swmm-pandas
-Version: 0.6.0
+Version: 0.7.2
 Summary: SWMM binary outputfile reader and API
-Keywords: swmm5,swmm,stormwater,hydraulics,hydrology,
+Project-URL: Homepage, https://github.com/karosc/swmm-pandas
 Author: See README.md
-Author-Email: Constantine Karos <ckaros@outlook.com>
-Maintainer-Email: Unknown <ckaros@outlook.com>
+Author-email: Constantine Karos <ckaros@outlook.com>
+Maintainer-email: ckaros@outlook.com
 License: CC BY 4.0
+License-File: LICENSE.md
+Keywords: ,hydraulics,hydrology,stormwater,swmm,swmm5
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: Other/Proprietary License
 Classifier: Operating System :: MacOS
@@ -18,11 +20,23 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
-Project-URL: Homepage, https://github.com/karosc/swmm-pandas
 Requires-Python: >=3.9
 Requires-Dist: julian
 Requires-Dist: pandas>=2.1
 Requires-Dist: swmm-toolkit>=0.8.1
+Provides-Extra: dev
+Requires-Dist: coverage; extra == 'dev'
+Requires-Dist: furo; extra == 'dev'
+Requires-Dist: ipython; extra == 'dev'
+Requires-Dist: matplotlib; extra == 'dev'
+Requires-Dist: mypy; extra == 'dev'
+Requires-Dist: myst-parser; extra == 'dev'
+Requires-Dist: nbsphinx; extra == 'dev'
+Requires-Dist: numpydoc; extra == 'dev'
+Requires-Dist: pytest; extra == 'dev'
+Requires-Dist: ruff; extra == 'dev'
+Requires-Dist: sphinx; extra == 'dev'
+Requires-Dist: sphinx-autobuild; extra == 'dev'
 Description-Content-Type: text/markdown
 
 ![image](docs/_static/logo.png)

{swmm_pandas-0.6.0.dist-info → swmm_pandas-0.7.2.dist-info}/RECORD

@@ -1,19 +1,18 @@
-swmm/pandas/__init__.py,sha256=Us40OUluS-DMwAJoQd3hfIlh2eswOgo1hetIftLP5bw,187
+swmm/pandas/__init__.py,sha256=i4rwvkEEnNJDxKeI7ju_BvDnPCS_8ZmqUeheU0_evGI,187
 swmm/pandas/constants.py,sha256=qa1tT8Fk1Fwx7WW1snRVQdsJqNvMppXGdOEvqS5pCL0,818
+swmm/pandas/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 swmm/pandas/input/README.md,sha256=WYfDQZk4MLoog0DbJapj3A-nJ5Oymet87bTZctigTJ0,9061
 swmm/pandas/input/__init__.py,sha256=kMclaDYaxKPslYApMP288JJ0q9OPukneMtxIM-XX2PE,88
-swmm/pandas/input/_section_classes.py,sha256=pdCQCT_gnSNE24ZKlyMXyYo0pZ9DMx6Y4qarjC0b0yo,65912
+swmm/pandas/input/_section_classes.py,sha256=1Qg3EsxFaZWeLYmeOnsCz2DTzENkQzYoCT9riRkesGM,68272
 swmm/pandas/input/input.py,sha256=a9zTmQnE-pUa9aspVnnoQ48Uol3O--BmY2bE8p3Ejl8,26834
 swmm/pandas/input/model.py,sha256=g6rQaJU5YPTxWyU6guBzD-uS-EDO4Yhl6hnbyDerAAY,12503
 swmm/pandas/output/__init__.py,sha256=SiYg_7jCB8jXIW6-3eKDSG6f4Svx7MfG6oSTSlYXhlg,96
 swmm/pandas/output/output.py,sha256=UnCzG2qIjoSRfkXbYNbSydlJz-GVyuZAkDLZCxFbQwY,94946
 swmm/pandas/output/structure.py,sha256=S4YkJxsNH5NypBsnHkCWTQRwV4SJPgMKemJTlfuur9U,11407
 swmm/pandas/output/tools.py,sha256=s3zYKCQuSdf5knxMR8tWhXrzBIwO-z3Eyu_5E5lHUzw,909
-swmm/pandas/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 swmm/pandas/report/__init__.py,sha256=0bPum2ycAhrk4BSM1_vScTH27btxhTPcvE2eRjVYaYg,45
 swmm/pandas/report/report.py,sha256=WESMhm4DcfAkfLWgqxg5Sf1KWTUKbXlHMK9DXPKyy34,27012
-swmm_pandas-0.6.0.dist-info/METADATA,sha256=oIOIU7w-lyQ8trmeQbDWn-w7e_m4ueHl6ooiRmtddB8,2434
-swmm_pandas-0.6.0.dist-info/WHEEL,sha256=pM0IBB6ZwH3nkEPhtcp50KvKNX-07jYtnb1g1m6Z4Co,90
-swmm_pandas-0.6.0.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-swmm_pandas-0.6.0.dist-info/licenses/LICENSE.md,sha256=GVMQw_tyDr-ISCPZ4D5GuS2n_L9CQeZacvo9H3sQ-HU,17068
-swmm_pandas-0.6.0.dist-info/RECORD,,
+swmm_pandas-0.7.2.dist-info/METADATA,sha256=8POmPvQKvG1-Xw1WR1e0F_IULFTk51_UkGriRCVUmSA,2945
+swmm_pandas-0.7.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+swmm_pandas-0.7.2.dist-info/licenses/LICENSE.md,sha256=GVMQw_tyDr-ISCPZ4D5GuS2n_L9CQeZacvo9H3sQ-HU,17068
+swmm_pandas-0.7.2.dist-info/RECORD,,

{swmm_pandas-0.6.0.dist-info → swmm_pandas-0.7.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.4.2)
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any

swmm_pandas-0.6.0.dist-info/entry_points.txt

@@ -1,4 +0,0 @@
-[console_scripts]
-
-[gui_scripts]
-