hspf 2.1.1__py3-none-any.whl → 2.1.3__py3-none-any.whl

hspf/uci.py

@@ -221,7 +221,7 @@ class UCI():
             for line in self.lines:    
                 the_file.write(line+'\n')
 
-    def add_parameter_template(self,block,table_name,table_id,parameter,tpl_char = '~'):
+    def add_parameter_template(self,block,table_name,table_id,parameter,tpl_char = '~',opnids = None,single_template = True, group_id = ''):
         
         table = self.table(block,table_name,0,False).reset_index()
         column_names,dtypes,starts,stops = self.uci[(block,table_name,table_id)]._delimiters()
@@ -229,20 +229,31 @@ class UCI():
         width = stops[column_names.index(parameter)] - starts[column_names.index(parameter)]
 
         ids = ~table[parameter].isna() # Handle comment lines in uci
+        parameter = parameter.lower()
+        if opnids is not None:
+            ids = ids & (table['OPNID'].isin(opnids))
 
         # Replace paramter name with PEST/PEST++ specification. Note this does not use the HSPF supplemental file so parameters are limited to width of uci file column
-        pest_param = tpl_char + parameter.lower() +  table.loc[ids,'OPNID'].astype(str)
-        pest_param = pest_param.apply(lambda name: name + ' '*(width-len(name)-1)+ tpl_char)
+        if single_template:
+            pest_param = group_id + parameter 
+            template = tpl_char + pest_param + ' '*(width-len(pest_param)-2)+ tpl_char
+            pest_param = [pest_param]
+        else:
+            pest_param = group_id + parameter +  table.loc[ids,'OPNID'].astype(str)
+            pest_param = pest_param.tolist()
+            template = [tpl_char + pest_param + ' '*(width-len(pest_param)-2)+ tpl_char for pest_param in pest_param]
+            #template = pest_param.apply(lambda name: tpl_char + name + ' '*(width-len(name)-1)+ tpl_char)
 
-        table.loc[ids,parameter] = pest_param
+        table.loc[ids,parameter.upper()] = template
         table = table.set_index('OPNID')
         self.replace_table(table,block,table_name,table_id)
+        return list(set(pest_param))
 
     def write_tpl(self,tpl_char = '~',new_tpl_path = None):    
         if new_tpl_path is None:
             new_tpl_path = self.filepath.parent.joinpath(self.filepath.stem + '.tpl')
         self.merge_lines()
-        self.lines.insert(0,tpl_char)
+        self.lines.insert(0,'ptf ' + tpl_char)
         self._write(new_tpl_path)
 
     def write(self,new_uci_path):

hspf/warehouse.py

@@ -46,41 +46,48 @@ def create_hspf_model_hierarchy_tables(con: duckdb.DuckDBPyConnection):
     -- Level 1: The overall Model (e.g., for a specific basin)
     CREATE TABLE IF NOT EXISTS hspf.models (
         model_pk        BIGINT PRIMARY KEY DEFAULT nextval('hspf.model_seq'),
-        model_name      VARCHAR NOT NULL UNIQUE, -- e.g., 'Nemadji River Basin Model'
-        description     VARCHAR
-    );
-
-    -- Level 2: A specific Version of a Model
-    CREATE TABLE IF NOT EXISTS hspf.model_versions (
-        model_version_pk BIGINT PRIMARY KEY DEFAULT nextval('hspf.model_version_seq'),
-        model_pk         BIGINT NOT NULL REFERENCES hspf.models(model_pk),
+        model_name      VARCHAR NOT NULL, -- e.g., 'Nemadji River Basin Model'
         version_name     VARCHAR NOT NULL, -- e.g., 'v2.1', '2025_Update'
-        release_date     DATE,
-        description      VARCHAR,
-        UNIQUE (model_pk, version_name)
-    );
-
-    -- Level 3: A Scenario within a Model Version
-    CREATE TABLE IF NOT EXISTS hspf.scenarios (
-        scenario_pk      BIGINT PRIMARY KEY DEFAULT nextval('hspf.scenario_seq'),
-        model_version_pk BIGINT NOT NULL REFERENCES hspf.model_versions(model_version_pk),
-        scenario_name    VARCHAR NOT NULL, -- e.g., 'Baseline_2020', 'Future_Climate_BMPs'
-        description      VARCHAR,
-        UNIQUE (model_version_pk, scenario_name)
-    );
-
-    -- Level 4: A single execution (Run) of a Scenario
-    CREATE TABLE IF NOT EXISTS hspf.model_runs (
-        model_run_pk   BIGINT PRIMARY KEY DEFAULT nextval('hspf.model_run_seq'),
-        scenario_pk    BIGINT NOT NULL REFERENCES hspf.scenarios(scenario_pk),
-        run_id         BIGINT,
-        run_name       VARCHAR,          -- e.g., 'Run_1995-2015', 'Calibration_Run_A'
-        start_year     INTEGER,
-        end_year       INTEGER,
-        run_timestamp  TIMESTAMP DEFAULT current_timestamp,
-        notes          VARCHAR
-    );
-    ''')
+        --last_extension   DATE,
+        --last_update      DATE,
+        --last_calibration DATE,
+        description      VARCHAR
+        -- release_date     DATE,
+        UNIQUE (model_name, version_name)
+                );
+                ''')
+
+    # -- Level 2: A specific Version of a Model
+    # CREATE TABLE IF NOT EXISTS hspf.model_versions (
+    #     model_version_pk BIGINT PRIMARY KEY DEFAULT nextval('hspf.model_version_seq'),
+    #     model_pk         BIGINT NOT NULL REFERENCES hspf.models(model_pk),
+    #     version_name     VARCHAR NOT NULL, -- e.g., 'v2.1', '2025_Update'
+    #     release_date     DATE,
+    #     description      VARCHAR,
+    #     UNIQUE (model_pk, version_name)
+    # );
+
+    # -- Level 3: A Scenario within a Model Version
+    # CREATE TABLE IF NOT EXISTS hspf.scenarios (
+    #     scenario_pk      BIGINT PRIMARY KEY DEFAULT nextval('hspf.scenario_seq'),
+    #     model_version_pk BIGINT NOT NULL REFERENCES hspf.model_versions(model_version_pk),
+    #     scenario_name    VARCHAR NOT NULL, -- e.g., 'Baseline_2020', 'Future_Climate_BMPs'
+    #     description      VARCHAR,
+    #     UNIQUE (model_version_pk, scenario_name)
+    # );
+
+    # -- Level 4: A single execution (Run) of a Scenario
+    # CREATE TABLE IF NOT EXISTS hspf.model_runs (
+    #     model_run_pk   BIGINT PRIMARY KEY DEFAULT nextval('hspf.model_run_seq'),
+    #     scenario_pk    BIGINT NOT NULL REFERENCES hspf.scenarios(scenario_pk),
+    #     run_id         BIGINT,
+    #     run_name       VARCHAR,          -- e.g., 'Run_1995-2015', 'Calibration_Run_A'
+    #     start_year     INTEGER,
+    #     end_year       INTEGER,
+    #     run_timestamp  TIMESTAMP DEFAULT current_timestamp,
+    #     notes          VARCHAR
+    # );
+    # ''')
 
 def create_model_run_table(con: duckdb.DuckDBPyConnection):
     """

{hspf-2.1.1.dist-info → hspf-2.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hspf
-Version: 2.1.1
+Version: 2.1.3
 Summary: Python package for downloading and running HSPF models
 Project-URL: Homepage, https://github.com/mfratkin1/pyHSPF
 Author-email: Mulu Fratkin <michael.fratkin@state.mn.us>

{hspf-2.1.1.dist-info → hspf-2.1.3.dist-info}/RECORD

@@ -1,20 +1,30 @@
 hspf/Masslink_Timeseries.csv,sha256=TOV6PpR0SBI0FaAU1T-qyD2DyGsBFjUWZenvWXiS3wA,4985
 hspf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hspf/build_warehouse.py,sha256=J3fgycY9xkZdY3C9u0wDaEX1n6satr1t0mQmfg4Fh6E,20205
-hspf/hbn.py,sha256=xUvovcAXXLLLE_ID9kejjiyaAqnh-vwmDLdPLjsGQ8A,19401
+hspf/build_warehouse.py,sha256=y91vNmdt918H5_jx9nxMUVmRG9ORdChYWEqQbbi3YKs,22861
+hspf/hbn.py,sha256=-db1mC8m7MetQGQ8T_UZZW6KkbVwrVkKE4ub9Ji6i9M,24133
 hspf/hbn2.py,sha256=OmuTVDxd0Boyd3GvBgzEfqvP7CTeYIJYPC7EXPgYu30,13190
 hspf/hbn_cy.c,sha256=ZIJwWxyGx8fE5nM1HBd8-zNotmStGZscqXijl3KSRdI,593464
 hspf/hbn_cy.html,sha256=o8wMdvEE547DRXcUHFPgAkkyJ665b6rloGL-qKClaTo,137735
 hspf/hbn_cy.pyx,sha256=T-itpkvHlxHzQHKtJBS-M8_ToLBa1U_ajpV53hh_oI8,4323
-hspf/helpers.py,sha256=cd8J3XfCFmpER475Mk5aFL29612rgop75GRGxlofXQo,3242
-hspf/hspfModel.py,sha256=K_xF7HtuMpDMod56Z3IXDCeGsnUi8KGhly_9tm-mxoY,9070
-hspf/reports.py,sha256=bU9rU9qaffXosxyA3H5OWi4SqQVPiQh6709tTCMYeeU,46286
-hspf/uci.py,sha256=rsi_KJqdfBFp0rlKCHyhmQGdB_rgNE8k6abTjH26UqE,33982
+hspf/helpers.py,sha256=Jv5lSUKVqML8iJOFfBPcA3bgHn9MbFZC4OO-9YHHP_w,3277
+hspf/hspfModel.py,sha256=Dpf0VHWAdQ7N932u6aYzXDzZCPrJbObW38tP0WRkG0E,10682
+hspf/reports.py,sha256=cDhjMFrUAzU7zzoX4VPyCJvgVLObtApEWTkK1vFsKfQ,57304
+hspf/uci.py,sha256=mi5lkt2bZlO0Lq4S7j3uZsLpHhS6dtdOIaO2Vi0ZNn8,34607
 hspf/validations.py,sha256=BcNT0h5QDZW9lHpXk8KuHQvycl8a_4jQ91srwWFodRo,6666
-hspf/warehouse.py,sha256=1zm1uu_QvevIuAMNPOkzspnFhNpLQrvkq3x3HXSypGg,11898
+hspf/warehouse.py,sha256=12Scro1a_hK5IvE9FENAMQv9jKWgtMYtAftJZ4p3nTQ,12239
 hspf/wdm.py,sha256=q0hNqsMNrTkxHtKEX0q0wWlIZabXv6UX2HjNCF9WEW4,12734
 hspf/wdmReader.py,sha256=-akKWB9SpUzXvXoQMeHLZNi_u584KaeEOyHB-YolTWM,22848
+hspf/bin/WinHSPFLt/ATCoRend.dbf,sha256=3bHSDSpL__z1syz6nXlhPrPLnmcsaKDSG1xaiESHwpQ,17743
+hspf/bin/WinHSPFLt/ATCoUnits.mdb,sha256=vJMovhTfyY_2hzzeqLdh-UjId1GV_pVPfesp29J2N18,114688
+hspf/bin/WinHSPFLt/ERROR.FIL,sha256=XKxOp21R0aCEd-ofy3UEQ91XH0V8cxgiURp4Z7J8E6M,1523002
+hspf/bin/WinHSPFLt/LF90.EER,sha256=VpQ92SHdRvIm-OxGMKawKn56ij3-6owFXsYHoZN9mVM,41040
+hspf/bin/WinHSPFLt/LF90WIOD.DLL,sha256=loIi_u234J-fbXq_s_ajMEjalyX3cdnFFtsH6Hm48C4,90112
+hspf/bin/WinHSPFLt/MapWinUtility.dll,sha256=oEcJfvQS7zIGHg5HcRHFv105pySy_V1g2LHwC3zy29o,83456
+hspf/bin/WinHSPFLt/StatusMonitor.exe,sha256=euLR4tKiMYoc7by6Rmem4CAk41Jjecsy4sgUOrRZHFA,39424
 hspf/bin/WinHSPFLt/WinHspfLt.exe,sha256=Afs_nJ62r1VnTL2P4XfiRJ1sH2If5DeGTbcCzoqlanE,74752
+hspf/bin/WinHSPFLt/hass_ent.dll,sha256=jvm_xLGSci4Sm1VSIVy8dS2-wgNn1dqkcth3vkm9IG0,4904448
+hspf/bin/WinHSPFLt/hspfmsg.wdm,sha256=cfUDyfYKX7Lsrlnu9kDylQNhD1X5lFWVqmLyXMLD5m0,1392640
+hspf/bin/WinHSPFLt/hspfmsg.wdu,sha256=Zl04zGkVN_1ifjsHmDyHFYUC3q6bojWm-vzXoXgJOv0,63
 hspf/data/HSPFParameterRanges.csv,sha256=PKz1DRIgpsgTEDrVaSHB9SAGMa5yUBRpyZDc9-CKJJo,28357
 hspf/data/LandUseNames_Mappings.csv,sha256=Bb2toZn6FkPfZ6_8SnzIQvXJ03ycwCuc8uyv4cUowNY,75899
 hspf/data/ParseTable.csv,sha256=ExqUaZg_uUPF5XHGLJEk5_jadnDenKjbwqC4d-iNX_M,193609
@@ -38,8 +48,8 @@ hspf/data/Timeseries Catalog/RCHRES/OXRX.txt,sha256=NWdRFpJ60LsYzCGHjt8Llay3OI8j
 hspf/data/Timeseries Catalog/RCHRES/PLANK.txt,sha256=0MAehIrF8leYQt0Po-9h6IiujzoWOlw-ADCV-bPiqs0,3508
 hspf/data/Timeseries Catalog/RCHRES/SEDTRN.txt,sha256=SiTgD4_YWctTgEfhoMymZfv8ay74xzCRdnI005dXjyE,659
 hspf/parser/__init__.py,sha256=2HvprGVCaJ9L-egvTj1MI-bekq5CNjtSBZfrCtQi3fs,92
-hspf/parser/graph.py,sha256=jvkjz9eNtBFEmxUeQosuQE7XgsIRlrNH-rSny5KBDoE,33046
+hspf/parser/graph.py,sha256=un5B7PiiaG9aWQHFeD1gHZtlWIIUnx4GG_-IER-4SmU,33119
 hspf/parser/parsers.py,sha256=x3othxQogUmGNe_ctCU20atDrRM_B4lEbVJb3EMbwto,20850
-hspf-2.1.1.dist-info/METADATA,sha256=KtAPnc8v-bT8ow30iHdN1lCm2asH22rvOyKgDGS_kL0,605
-hspf-2.1.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-hspf-2.1.1.dist-info/RECORD,,
+hspf-2.1.3.dist-info/METADATA,sha256=U-tcOOkBzPIgs2oMbnSdXznyT4oTU2lxvnneVSC5vvk,605
+hspf-2.1.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+hspf-2.1.3.dist-info/RECORD,,