shakemap-modules 1.1.0__tar.gz → 1.1.2__tar.gz

{shakemap_modules-1.1.0 → shakemap_modules-1.1.2}/CHANGELOG.md

@@ -1,5 +1,14 @@
 # main
 
+## 1.1.2 / 2025-03-13
+    - Fix points mode in model to use the same bounds that grid mode would use, insuring consistent bias between modes.
+    - Set a fixed seed for FFSimmer RNG (RFF) to make results between runs and across deployments consistent.
+
+## 1.1.1 / 2025-02-28
+    - Refactor strings for sqlite to single quote string literals.
+    - Refactor to emove a bunch of linter warnings.
+    - Eliminate a bunch of deprecation warnings (datetime.utcnow(), etc.)
+
 ## 1.1.0 / 2025-02-07
     - Adding parameter for system_id in transfer_pdl.
     - Handling edge case in smclone where event does not have a depth. Logging a warning 

{shakemap_modules-1.1.0 → shakemap_modules-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: shakemap-modules
-Version: 1.1.0
+Version: 1.1.2
 Summary: USGS Earthquake Impact ShakeMap Modules
 Author-email: Bruce Worden <cbworden@contractor.usgs.gov>, Eric Thompson <emthompsone@usgs.gov>, Mike Hearne <mhearne@usgs.gov>
 License: License
@@ -54,7 +54,7 @@ Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: configobj>=5.0.8
-Requires-Dist: esi-shakelib>=1.0.15
+Requires-Dist: esi-shakelib>=1.1.1
 Requires-Dist: h5py>=3.8.0
 Requires-Dist: importlib-resources>=6.0.0
 Provides-Extra: assemble

{shakemap_modules-1.1.0 → shakemap_modules-1.1.2}/code.json

@@ -1,4 +1,76 @@
 [
+    {
+        "name": "shakemap-modules",
+        "description": "ShakeMap processing modules.",
+        "version": "v1.1.2",
+        "status": "Development",
+        "organization": "U.S. Geological Survey",
+        "vcs": "git",
+        "repositoryURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules.git",
+        "homepageURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules",
+        "downloadURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/archive/v1.1.2/shakemap-modules-v1.1.2.zip",
+        "disclaimerURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.1.2/DISCLAIMER.md",
+        "permissions": {
+            "usageType": "openSource",
+            "licenses": [
+                {
+                    "name": "Public Domain, CC0-1.0",
+                    "URL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.1.2/LICENSE.md"
+                }
+            ]
+        },
+        "laborHours": 1,
+        "languages": [
+            "python"
+        ],
+        "tags": [
+            "earthquake",
+            "utilities"
+        ],
+        "contact": {
+            "name": "Bruce Worden",
+            "email": "cbworden@contractor.usgs.gov"
+        },
+        "date": {
+            "metadataLastUpdated": "2025-03-13"
+        }
+    },
+    {
+        "name": "shakemap-modules",
+        "description": "ShakeMap processing modules.",
+        "version": "v1.1.1",
+        "status": "Development",
+        "organization": "U.S. Geological Survey",
+        "vcs": "git",
+        "repositoryURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules.git",
+        "homepageURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules",
+        "downloadURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/archive/v1.1.1/shakemap-modules-v1.1.1.zip",
+        "disclaimerURL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.1.1/DISCLAIMER.md",
+        "permissions": {
+            "usageType": "openSource",
+            "licenses": [
+                {
+                    "name": "Public Domain, CC0-1.0",
+                    "URL": "https://code.usgs.gov/ghsc/esi/shakemap-modules/-/raw/v1.1.1/LICENSE.md"
+                }
+            ]
+        },
+        "laborHours": 1,
+        "languages": [
+            "python"
+        ],
+        "tags": [
+            "earthquake",
+            "utilities"
+        ],
+        "contact": {
+            "name": "Bruce Worden",
+            "email": "cbworden@contractor.usgs.gov"
+        },
+        "date": {
+            "metadataLastUpdated": "2025-02-28"
+        }
+    },
     {
         "name": "shakemap-modules",
         "description": "ShakeMap processing modules.",

{shakemap_modules-1.1.0 → shakemap_modules-1.1.2}/pyproject.toml

@@ -24,7 +24,7 @@ requires-python = ">=3.9"
 # Requirements:
 dependencies = [
     "configobj>=5.0.8",
-    "esi-shakelib>=1.0.15",
+    "esi-shakelib>=1.1.1",
     "h5py>=3.8.0",
     "importlib-resources>=6.0.0",
 ]

{shakemap_modules-1.1.0 → shakemap_modules-1.1.2}/src/shakemap_modules/coremods/assemble.py

@@ -69,7 +69,12 @@ class AssembleModule(CoreModule):
     configs = ["gmpe_sets.conf", "model.conf", "modules.conf"]
 
     def __init__(
-        self, eventid, comment=None, process="shakemap", logger=None, points=None
+        self,
+        eventid,
+        comment=None,
+        process="shakemap",
+        logger=None,
+        points=None,
     ):
         """
         Instantiate a CoreModule class with an event ID.
@@ -150,7 +155,9 @@ class AssembleModule(CoreModule):
         #
         global_config = get_model_config(install_path, datadir, self.logger)
 
-        global_data_path = os.path.join(os.path.expanduser("~"), "shakemap_data")
+        global_data_path = os.path.join(
+            os.path.expanduser("~"), "shakemap_data"
+        )
         #
         # If there is a prediction_location->file file, then we need
         # to expand any macros; this could have the event ID, so we
@@ -170,7 +177,9 @@ class AssembleModule(CoreModule):
                     raise FileNotFoundError(
                         f"prediction file '{loc_file}' is not a valid file"
                     )
-                global_config["interp"]["prediction_location"]["file"] = loc_file
+                global_config["interp"]["prediction_location"][
+                    "file"
+                ] = loc_file
 
         config = global_config.dict()
 
@@ -188,7 +197,9 @@ class AssembleModule(CoreModule):
         rupturefile = os.path.join(datadir, "rupture.json")
         if not os.path.isfile(rupturefile):
             # failing any of those, look for text file versions
-            rupturefiles = sorted(glob.glob(os.path.join(datadir, "*_fault.txt")))
+            rupturefiles = sorted(
+                glob.glob(os.path.join(datadir, "*_fault.txt"))
+            )
             rupturefile = None
             if len(rupturefiles):
                 rupturefile = rupturefiles[0]
@@ -197,7 +208,7 @@ class AssembleModule(CoreModule):
         # Sort out the version history. Get the most recent backup file and
         # extract the existing history. Then add a new line for this run.
         #
-        timestamp = datetime.datetime.utcnow().strftime("%FT%TZ")
+        timestamp = datetime.datetime.now(datetime.UTC).strftime("%FT%TZ")
         originator = config["system"]["source_network"]
         backup_dirs = sorted(
             glob.glob(os.path.join(datadir, "..", "backup*")), reverse=True
@@ -212,7 +223,9 @@ class AssembleModule(CoreModule):
             history = bu_ic.getVersionHistory()
             bu_ic.close()
             version = int(
-                backup_dirs[0].replace(os.path.join(datadir, "..", "backup"), "")
+                backup_dirs[0].replace(
+                    os.path.join(datadir, "..", "backup"), ""
+                )
             )
             version += 1
             new_line = [timestamp, originator, version, self.comment]
@@ -248,7 +261,12 @@ class AssembleModule(CoreModule):
                 if maprun[2] > highest_version:
                     highest_version = maprun[2]
             history = {"history": history_list}
-            new_line = [timestamp, originator, highest_version + 1, self.comment]
+            new_line = [
+                timestamp,
+                originator,
+                highest_version + 1,
+                self.comment,
+            ]
             history["history"].append(new_line)
         else:
             #
@@ -283,7 +301,9 @@ class AssembleModule(CoreModule):
             momentfile=momentfile,
             datafiles=datafiles,
         )
-        self.logger.debug(f"Created HDF5 input container in {shake_data.getFileName()}")
+        self.logger.debug(
+            f"Created HDF5 input container in {shake_data.getFileName()}"
+        )
         #
         # Add any STREC data that is lying around
         #
@@ -324,7 +344,9 @@ class AssembleModule(CoreModule):
 
             # find the spec file for simulation.conf
             sim_config_spec = get_configspec("simulation")
-            sim_config = ConfigObj(infile=config_file, configspec=f"{sim_config_spec}")
+            sim_config = ConfigObj(
+                infile=config_file, configspec=f"{sim_config_spec}"
+            )
             results = sim_config.validate(Validator())
             if not isinstance(results, bool) or not results:
                 config_error(global_config, results)
@@ -345,7 +367,8 @@ class AssembleModule(CoreModule):
         Set up the object to accept the --comment flag.
         """
         parser = argparse.ArgumentParser(
-            prog=self.__class__.command_name, description=inspect.getdoc(self.__class__)
+            prog=self.__class__.command_name,
+            description=inspect.getdoc(self.__class__),
         )
         parser.add_argument(
             "-c",
@@ -378,7 +401,9 @@ class AssembleModule(CoreModule):
         # will not work as it will suck up any later modules'
         # options that are the same as this one's.
         #
-        parser.add_argument("rem", nargs=argparse.REMAINDER, help=argparse.SUPPRESS)
+        parser.add_argument(
+            "rem", nargs=argparse.REMAINDER, help=argparse.SUPPRESS
+        )
         args = parser.parse_args(arglist)
         self.comment = args.comment
         self.points = args.points
@@ -462,7 +487,7 @@ def _get_grids(config, simfile):
             grid2 = grid.project(GEO_PROJ_STR)
         else:
             grid2 = grid
-            
+
         # remove any nan's, maximizing the resulting area of good data
         grid3 = _trim_grid(grid2)
 

{shakemap_modules-1.1.0 → shakemap_modules-1.1.2}/src/shakemap_modules/coremods/augment.py

@@ -81,7 +81,9 @@ class AugmentModule(CoreModule):
 
         hdf_file = os.path.join(datadir, "shake_data.hdf")
         if not os.path.isfile(hdf_file):
-            raise FileNotFoundError(f"{hdf_file} does not exist. Use assemble.")
+            raise FileNotFoundError(
+                f"{hdf_file} does not exist. Use assemble."
+            )
         shake_data = ShakeMapInputContainer.load(hdf_file)
 
         # Prompt for a comment string if none is provided on the command line
@@ -160,7 +162,9 @@ class AugmentModule(CoreModule):
             shake_config.merge(event_config)
         elif os.path.isfile(event_config_zc_file):
             self.logger.debug("Found an event specific model_select file.")
-            event_config = ConfigObj(event_config_zc_file, configspec=spec_file)
+            event_config = ConfigObj(
+                event_config_zc_file, configspec=spec_file
+            )
             shake_config.merge(event_config)
         #
         # Validate the resulting config
@@ -170,7 +174,9 @@ class AugmentModule(CoreModule):
             config_error(shake_config, results)
         check_config(shake_config, self.logger)
 
-        global_data_path = os.path.join(os.path.expanduser("~"), "shakemap_data")
+        global_data_path = os.path.join(
+            os.path.expanduser("~"), "shakemap_data"
+        )
         #
         # If there is a prediction_location->file file, then we need
         # to expand any macros
@@ -189,7 +195,9 @@ class AugmentModule(CoreModule):
                     raise FileNotFoundError(
                         f'prediction file "{loc_file}" is not a valid file'
                     )
-                shake_config["interp"]["prediction_location"]["file"] = loc_file
+                shake_config["interp"]["prediction_location"][
+                    "file"
+                ] = loc_file
         #
         # Put the updated config back into shake_data.hdf`
         #
@@ -220,9 +228,13 @@ class AugmentModule(CoreModule):
                 rupturefile = faultfiles[0]
             else:
                 rupturefile = None
-        if (rupturefile and os.path.isfile(rupturefile)) or eventxml is not None:
+        if (
+            rupturefile and os.path.isfile(rupturefile)
+        ) or eventxml is not None:
             self.logger.debug("Updating rupture/origin information.")
-            shake_data.updateRupture(eventxml=eventxml, rupturefile=rupturefile)
+            shake_data.updateRupture(
+                eventxml=eventxml, rupturefile=rupturefile
+            )
         #
         # Look for a strec_results.json file and replace the existing one if found
         #
@@ -236,7 +248,7 @@ class AugmentModule(CoreModule):
         # HDF file, so: if we are the originator, just update the timestamp,
         # otherwise add a new line.
         #
-        timestamp = datetime.datetime.utcnow().strftime("%FT%TZ")
+        timestamp = datetime.datetime.now(datetime.UTC).strftime("%FT%TZ")
         originator = config["system"]["source_network"]
 
         history = shake_data.getVersionHistory()
@@ -268,7 +280,8 @@ class AugmentModule(CoreModule):
         Set up the object to accept the --comment flag.
         """
         parser = argparse.ArgumentParser(
-            prog=self.__class__.command_name, description=inspect.getdoc(self.__class__)
+            prog=self.__class__.command_name,
+            description=inspect.getdoc(self.__class__),
         )
         parser.add_argument(
             "-c",
@@ -286,7 +299,9 @@ class AugmentModule(CoreModule):
         # will not work as it will suck up any later modules'
         # options that are the same as this one's.
         #
-        parser.add_argument("rem", nargs=argparse.REMAINDER, help=argparse.SUPPRESS)
+        parser.add_argument(
+            "rem", nargs=argparse.REMAINDER, help=argparse.SUPPRESS
+        )
         args = parser.parse_args(arglist)
         self.comment = args.comment
         return args.rem
@@ -317,7 +332,9 @@ def main():
     if "comment" not in vhash:
         vhash["comment"] = None
 
-    mod = AugmentModule(evid, comment=vhash["comment"], process="main", logger=logger)
+    mod = AugmentModule(
+        evid, comment=vhash["comment"], process="main", logger=logger
+    )
     mod.execute(config=config, indir=datadir, outdir=outdir)